Improved performance; less obtrusive logging

Change-Id: I278636f5858b2613ae95a1396af8c13085331649