Cleanup: unified and cleaned URLs