Have not seen much usage of these, remove unless others are using.

Change-Id: I4aa55f90d006e339a888f6a64b787cf2cfa4d02e
Merge "Have not seen much usage of these, remove unless others are using."