Removed unused model classes