forgot to remove references to service message