Remove some superfluous code