Removing some dead code