Removing more dead code, fixing NormalizeURL to return a string