refactor wait_until to become wait and removing (wait_finished, wait_finished, wait_started, wait_until, wait_states)