[PATCH 2/2] Remove old UI logic.