Try harder to clean up after run