gatt.xml cleanup