remove file correctly
Merge branch 'MOODLE_24_STABLE' into MOODLE_24_BFC