UniRS: cleanup