Clean up function declarations and some unused functions

Change-Id: Ic720aa7b30bbe56d67e0b65f3e047ad3ae521a97