cleaning up some dead code