Cleanup a few APIs in mock agent

Change-Id: I1846e06f14e92f55499052d55b3e3720e0d30691