Some more code cleanup
Restored saving of last Mensa