removed some commented code out