Cleanup models and remove BaseModel