Final URL cleanup