Remove references to old UI