Get rid of OPTIONS while retuning.
Fixed teardown.