Sample UI cleanup