Remove unused logging
Merge branch 'clean-up'