Removing unused code, via jdarpinian.