Remove extraneous code

Methods that were not being used were extracted from the model and controller