issues - removing cors surrogate