Cleanup overlay trees
Cleanup overlay trees