Default to not saving psns and nbh data.
Remove deprecated code.