Remove some superfluous code and a TODO