Clean up some replication code.