Unused code had been removed.

Change-Id: I577ff7cc8dd14df77639091e8e68ba221cf15412