Trivial cleanup and commenting out a line in a test