refactor to allow multiple connections - remove saved off connection