Removed old code from old controllers