Drop redundant top-level containers