rm some UI wrappers