remove outdated code which cause issue

Change-Id: Ida39ef523c714dc43069298c37ba60aced985d5e
Merge "remove outdated code which cause issue"