cleanup in preparation for order patches