Removing some logging
Merge branch 'master' into running-manny