cleanup messages
cleanup messges and fix #1009
better default to DBS3/prod/
Merge pull request #1010 from belforte/master

cleanup messges and fix #1009