Eradicating url() calls

This is not correct, should probably use url() instead, the token replacement needs to be a string.