Another attempt at URL cleanup