remove some remains from the old patch