[Task] Models cleaned up