remove waffle, fixes #16