Remove hard coded url defs