Remove dead code

Change-Id: I9c96d3d21bd3faed91a5146f5a2b8916c634fdff
6 files changed