remove some commented code and debug statements