get rid of some superfluous code