Remove some deprecated methods

Change-Id: If918a7ed1346dbf2924dbc7106adbc19376abe59