Remove hard-coded scheme