cleanup XQuartz work per @vcunat's suggestesions