CMS-4639 Simplify ContentEditor