Delete commented-out code that was actually not commented out properly, and so caused warnings. Merged from MOODLE_18_STABLE.
Delete commented-out code that was actually not commented out properly, and so caused warnings. Merged from MOODLE_18_STABLE.

dilawar/moodle