Don't teardown on master

is it correct to have this commented out?