Fixes.
merged with remove_from_import