removing some dead code