removed commented and unused code