cleaned some dead code