Clean-up.
Remove connection check. Did not work reliably.