Remove unneeded Model class