get rid of outdated wait_untils