Remove dead code

Test: builds
Change-Id: I57cf72ca460115463d7759097d5ba598b5ec1775
13 files changed