Move clean up into a teardown method