Additional cleanup

Missed some unused code there. Thanks, @jdaggett!