Simplify the Agenda controller