#Bugfix: Adapt preconditions for Cleanup