minor cruft cleanup