Controller changes
Old controller cleanup