switch to rm for testing
Version 1.4.2: Cleanup bug fix

* Change way stuff is cleaned up