Removing debug logging
Merge branch 'master' into staging