Clean up function declarations

Change-Id: Ia811e9d3a6745e75fddddb6c6876316fde3629d8