Also removed unnecessary input ID in various methods Change-Id: I50a2da924e9442312ccf16278e9123f837ec8942