add some more cleanup hooks