Reove some unused code. This commit was SVN r8551.
This commit was SVN r7999.
This commit was SVN r6269.