Fixing issues with the endless cleanup.