Revert some of Wais changes. Dont delete stuff from UI!