Remove unused functions

Change-Id: Iddf4e29005aaa510af00c7345487996b75f41c41