Some more file cleanup