Removed final references to the UI.