Cleanup a few APIs in mock agent

Change-Id: I03c1ce8bdaf4612f08593d687fb61448c57ac940