waffle and cleanup