Merge "remove some not-so-useful-logging"