Merge "Removing some dead code."