Refactored out some unnecesary controllers