Removed rm_star_wait