Removing hard-coded URL