Cleanup of controllers and referee