Cleanup of the cleanup file

Moved the cleanup to another branch
Conditional delete
bump version