Clear out redundant logging
Merge branch 'newdev' into test