Removed obsolete imports from core models