Remove unused functions

Change-Id: I3230412e6aad7aab0f2fd034cc7b289cd4cd6a97