Removing cruft again