removed commented and unused