most debugging cruft removed.