Support CORS

clean up