clean up some dead code