UtilityLibrary: some cleanup