More cleanup of logs/errors