Clean up function declarations

Change-Id: Id79786060f3485c9c60f5561bb9590179947b3ce