Remove some dead code

Change-Id: I32286f2000cbb65a99a8cd2e47c9fcc6279cce13