Cleanup button removed

Cleanup is now done by default