Manual sweep of !32385 (Cleanup of MCP packages for master)

Hi,

since the automatic sweep of !32385 (merged) into 21.2 failed, here the manual sweep.

Best, Nico