UC-30 Additional code cleanup