Pull in removal of superfluous code.