Getting rid of some dead code.