Remove more mercurial hangovers