Removed old controller helper