Remove CORS from master branch.  There is a separate branch with CORS to be merged