Begin cleanup of URL mess