remove superfluous code