Removed old controllers and removed unused dependencies