Clean up

Cleans up saves affected by the problem addressed in !2730 (merged), and some other old variables I found lurking in one of my saves.