Remove unused service tags and client

This commit removes unused service tags and a client. We should keep our
code clean as possible.

Change-Id: I428ac6740feaaabdd17a02a03ea5230d202d89d2
2 files changed