Completes tidy up of ActivityController.