Clean up function declarations

Change-Id: I0602166c8e6485b68e06bbcc9f0064938facd3fa