Removed unnecessary imports from refactored model classes