game: some clean up refs #51