Even better cleanup

For @tcolar 

Please try this with the "-n" flag to suppress cleanup at exit.