removed some commented code and an unused function