Updated the content broker service and removed the old content entry service.