Remove dead code

Change-Id: I1ac813afa47e38fb508e676d25d103a29bfada6a