Alexander9673 remove some unused code