3.16 - 3.18 XML + FileExplorer cleanup