More file cleanup