Remove dead code

Change-Id: I75224fb2ca3cf123d4f88aa1c211108f15dfcbf7
Merge "Remove dead code"