removal of superfluous code