Simplify activations_controller a bit