Removing hardcoded URL