remove old waffles

r? @ngokevin @andymckay @chuckharmston @diox