Codetidying - remove a couple of unused params

& an unused , undeclared return 

(these are all ones phpstorm picked up & I checked them)