Refactoring, removal from BaseGameApp. AH-195