Remove unnecessary tear down and fix argument order