Remove most ~[] usage