Remove redundant federation connection wrapping code