cleanup messages
cleanup messges and fix #1009
better default to DBS3/prod/