Remove hardcoded timeout