[security] Started UI cleanup