Add cleanup using agenda, fixes #18