Refactored MapScene clean-up code