Ditch more now superfluous code.