ssl and remove broken wait