Delete cruft and update existing schemes