r23665: Remove two unneeded global variables