removing hardcoded code

Change-Id: Ia107aa0822e3a1866ac0b346c4b14ae221e780a1