removed some commented code