Remove do not save on no players, some refactor