More cleanup after removal of causal consistency