Looks like should_clean_connection_proxy should check "current_model.replicated || fully_replicated?" not just "@replicated"