Remove unused code

Change-Id: I9d407fcdbee66b44504c5d092d32113114e2ac46