Removed unnecessary code.

Change-Id: I1e8cb44e02d2e43194c6e2e5f77a4b1842e67ea2