delete dead code

Change-Id: Ie2b751f7fda4a76ca1e4c22b7fdc65c5db1d5db5