In order to improve efficiency, remove useless code. Change-Id: I8dae9afe1d18dcc701143905a5219bc47d4da894