cleaned up some dead code