getting working directory cleaned up (reverted from commit 6cdfe42b62896841cb67fe12e3751530dd6774ec)