removing stop early conditions