Remove some more old, unused code