savegame: cleaning up helpers