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

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