Remove unused inline functions

Change-Id: Ic31f99d6185000660750041065937845d4903bb3