remove dead code and update the import mappings slightly