Remove an unreachable return statement.
Merge pull request #4297 from abhinav-upadhyay/unreachable-code

Remove an unreachable return statement.
Merge pull request #4300 from Carreau/fix-4299

Traits defauts should be strings not object
inprog
usejson
cleanup