Temporarily remove unimplemented parameters

Change-Id: I9766476a8745dd7836499ed123d56828b865ed7d