UC-54 code cleanup