For PoC, service APIs aren't necessary. Remove them for simplicity. Change-Id: I5d6cd291366ec0a1ee55d22c8a0a1548a4683df3