Cors clean up