Removing more cruft