remove some things from openbsd-wip which were already committed to cvs