[Xcconfing] Disable headers map && minor clean up