Intial clean up for Moodle 2.4