Removed old controller+