Properly getting rid of Waila integration