Remove unused functions

Change-Id: Ifa8fad734c716deeed32137f09cbe88378d11faf