remove cruft which is causing tests to hang