Small cleanups
update tinymce to 4.1
remove workaround that is no longer needed