WAI Fixes

Tidied up unneeded WAI files.