Remove 'if's now that we are using a partial ofr the url list