Dead declarations

Change-Id: I5fe417a6f3682764f8ff1844cc418e95d68c6c38