Clean up function declarations

Change-Id: Ie1360857dc4ed3102c709c1ef5b5929e5d5d5d7b