Remove superfluous code