Review main Merged

12279[TASK] Remove last XCLASS statements

Christian Kuhn CR +2 V +2 Hard +8 −281 updated 06/03/13, 20:49