Refactoring due to UCSUtils cleaning