Clean up function declarations and some unused functions

Change-Id: I80d15f503bb5714340c051cc1c4890a445e44d56