cleaning up imports in factory