Did some more file cleanup