removing unused cruft