take out some more old params

Change-Id: Ie7777e518864975eb1ae9a7051d19b0bd3c426b8