Removes hard-coded urls, fixed #353