clean up more commented out code.