Move more api-only methods into api_controller