|User Interface| cleanup