Remove some more cruft