remove replication and some other changes