[CLEANUP] cleaned unused and commented xml blocks