Pulls teardown into connections submodule- completes refactor for now.