clean up minor things and remove IOError - saves 40kb GC
remove .rej/.orig files from previous patch