Clean unused import + Clean unused xml code