Remove commented code.  Same for lines 81-84.