add clean-up invocations for waffle