Correct variable transposition in logging
Refactor Surrogate property inits
Delete message from queue if DSID already exists