redundant stack tracke
cleanup
cleanup
added testcases for the replication