Cleanup a few APIs in mock agent

Change-Id: I129c02b61b608f541613c050c3ea18f6c47a245f