chess: some cleanup