remove helper - logic back to service