Removed Cruft from controllers and commented