Refactor less repetition
Comment out bogus log entry