clean up custom agendas
clean up custom agendas and unused functions