Got rid of more commented code