Remove unused functions
am: 910a238c21

Change-Id: Iac93896b81a6fc76f7db4868076e86d651b7f818