UC-115 removing unused code