Fix ancient copy n paste error
Remove unneeded teardown, all this is handled by baseclass already
Remove some unneeded update calls