removed some commented and unused code