Remove unused code

Change-Id: Ifaab2aecec65ec6e81056e5fca430df8ca3af908