removed all replication related stuff - will reinstate if we ever need it in the future
merged in master - dropped replication stuff