Removing CKEditor script references from theme master pages and defining them in the block's OnLoad event. Refactoring HtmlContent to use JS module pattern in Rock.controls.js.