clean up the Parameters, now that we use them