Remove unused code

Change-Id: Ie16056c7e6716831a0ba61c1f22ded978fb5f3c2