Feature/issue317 cleanup events