Remove the markup control panel, as it was moved to Products.CMFPlone.