Removed basics from controller