GameController/NaviUnit cleanup