made stable to changes to model classes
Took out unnecessary code, and redundancies.
Any empty methods are still in workshop