Remove the import expansion and deadly map that was used by many threads