remove waitFor macro