Clean up files a bit, remove useless fragment