UC-44 code cleanup