get rid of superfluous code