Remove a couple more direct UI calls.