Improved cleanAll

Catch not working as intended though