reverted some changes that break tests. unfortunately I have no idea why and suspect bugs may be hidden
remove logging
merge