Removed unused code

Change-Id: I227940160f656a0aed48e2fa821303ee4c1d53ba