Commented out deprecated code, cleaned controllers.js in general