Two paramemters are not in use, therefore are removed. Change-Id: I41eb601b7b4bf2feedb13b3f240315656d8694f9