Some code cleanup
Merge branch 'master' into refactor
Removed noisy log messages