killing some dead code