fixes required by refactoring
small fix about replication + remove debug logs