Revert "Menufix MCP/UCP"

This reverts commit f349fac87f747bbe5fc1ac9ef7693e86d6ecc614.