Remove commented out, dead (and incorrect) code.