removed dead/commented code