Revert "small setup for agenda cleaner, can most likely be dumped later"

This reverts commit 9514f46646f17ee46b7a503746af492d937637a1.