Removes the waffle flag checks, also removes legacy files which are no longer needed.
Merge pull request #1920 from darkwing/remove-redesign-waffle

Remove 'redesign' waffle flag checks, remove/rename bundles.