Removed connection refs pulled over in cherry-pick from 10.0