cleanup logging issues