Remove commented out code.
Point the [connections] shortcode to the new class.
Point all remaining function calls to teh new shortcode class.
Remove commented out code.