Dead declarations

Change-Id: I43e388df118b9e08ab8c05cad31871ef0af35164