Remove two UCS wrapper functions, formatting