Remove do condition for now