Bug #1185 fix - always cleanup

Cleanup the environment for all situations - new game, loading a save game or after failing a save game load.