Remove cruft
Remove more cruft