Removed redundant connection keeping solution