remove some commented code