Remove connection helpers, move all conn specific functionality back into connections