DC | #4131 | removing logging and minor refactoring