UC-85 removing test code