Clean up unused functions

Change-Id: Ic1ba88f99c3e0de0761a28b8ff0ca2e9416aecec