[TASK] Remove last XCLASS statements