Fix issue #59. Remove some unnecessary logging
Resolve conflict