Remove unused cruft