Deleted unused classes, commented up IModel