Remove unused elements.

Change-Id: If8965b7793d2f88bfacd023a8eea237b9cb8a69c