Misc. file cleanup