Remove dead code

Change-Id: I7d708dc2772b62c4a1d71cbb3f9b1ff40fe42095
Merge "Remove dead code"