Remove validator leftovers