Wan replication cleanup

According to #2435