removed dead or commented code