Some logging cleanup; TODO
Adding ignore