chore(cleanup): Correctly return a service message