Even more file cleanup