A little clean up from unused code.