Move cleanup hooks into scenarios