Remove some now unused code