Remove some unused items of code