Better cleanup before jenkins test run