logging should removed / disabled before merging