Cleanup of imports and removal of old importer classes/tests