Add possibility to delete with custom timeout

and optimize wait for "continue" button shell