Removes the waffle flag checks, also removes legacy files which are no longer needed.