Cleanup before full stack test