remove unused cruft