Clean up Client Api Module

Change-Id: I0151c83b9466d18ee451124252c5715647d54aa3
Merge "Clean up Client Api Module"