Removals for 2.11 — The (hopefully) uncontroversial parts