Cleaned up old controller actions