Remove dead code

Change-Id: I494fbf146ad905d07e2d67a55fdec7092e778c46