UniRS: clean up