Remove more cruft, we can always add it back