Remove duplicates and fix service name

And remove invalid uid

Change-Id: I4c930d0d881b2088c23a03e0728ff2abdfcd4944