[REFACTOR] Remove require 30s timeout