New file cleanup (and general cleanup)