Unused functions

Change-Id: I6c1f8dc33e3ba3257044889d7aae1223572590e9