File cleanup and another retina fix