Cleanup remains of legacy replication API
Merge pull request #223 from wajam/manu-replication-legacy-cleanup

Cleanup remains of legacy replication API