Removing even more cruft