Remove extra menu items.
Bring fixed manager in from experimental.