Cleaned up some code/fixed some warnings.

I'm sure nobody has any of the old save files anymore so I removed the
functions.