Remove dead code

Change-Id: Ie5aae1fcd43693bc582beb588bf95e56101c6429