More cruft removed.