Clean up function declarations

Change-Id: I1be08414e3c816f01a9712eeb9474acc16838389