Get rid of unnecessary until