Remove unused functions

Change-Id: I49ee400e665160daf02574a0962ba7bd0239091f