Got rid of more commented out code.