Revert "Try it without the file moving rubbish"

This reverts commit 1242cc24e31954b86751e40f8bdeaf3693d31a51.
Clean up