tested again and removed last of logging