minor cruft removal