fix handling of locked game data and remove some redundant code while
doing so