[max_wait] cleaned up max_wait