Remove deprecated code

Change-Id: I5e054ea76ea1e29d526be55c72acde959edd73c4