take out some commented code, general clean up