Removing some dead codes