More initial file cleanup