removing hardcoded code

Change-Id: I0000000000000000000000000000000000000000