content editor should be removed here as well?