Delete cruft slightly more cleanly and safely