cleanup patch leftovers