further progress clean up game states