Remove unused functions

Change-Id: I0f305ef5b9f13e3516b3bbf45d405fad5115521a