Echo out service name and remove unused ensure

Change-Id: I9a041e0558b6bfbc94d3b500b49a08878d95157c