Clean up function declarations

Change-Id: I1f4a18e7aa6288e147c7f4c3f17bb99f1f0df5c5