Big cleanup of useless dependencies & overlays - part 2 (Common Tree)