Got rid of all that commented code...