Cleaned up some old unused code.