remove unused waffles

close #1691