Ui add cleanup