Moved some more _s
Disabled Logger pending further investigation