remove some more superfluous code