Merge pull request #477 from dajiaji/base-remove-import-map

Merge pull request #477 from dajiaji/base-remove-import-map #1023