Apply Neal's patch - Fixed os.remove