Removed old code, added some extra methods to controller extras