GameLogic cleanup