clean up unused params, pass in req'd

Change-Id: I0ec1a93292230bab3812e5208415c5aa3ea0ff66