Removed references to UI