UC-136 more code cleanup