clean up some old dead code