removed some commented out code for cleanup
removed some commented out code for cleanup