Touched up step definitions and removed a couple of unused parameters.