tidied up some models, controllers and views to remove redundant files