removing some dead codes