Continued cleanup of UI