===> Cleaning for connect-1.95