Removed obsolete controllers
Fixed phpdoc errors