Delete dead code

Change-Id: Iabe9cf9a4254ce4d90849f6fb9bd82a043beba2a
5 files changed