Feature/cleanup events

Added the feature as outlined in #317 

Text is now displayed for the cleanup events.