Remove dependency from content helper