cleared out some commented code