Remove dead code

Change-Id: Ib17e56c41fc19b1f20c5956edd9043e726a89e46
Merge "Remove dead code"