Clean up connects

Authored by danders on Jan 23 2019, 2:16 PM.