Remove a bunch of log statements. Advancing the refactoring.