remove "offensive" logging and unused import statements
Merge remote-tracking branch 'origin/master'