WIP, remove state from service.