If by removing you meant disabling the layout plugin in the admin panel, then when i do that, the map doesn’t show up at all and the dreaded CPU utilization issue comes back.
I haven’t tried rebuilding the container without the layout plugin, however, if that’s what you meant.
No worries about the support period. Realize you are moving and got your hands full. This is more about providing the data points for your future reference.