Remove pre-mature "transactional" effect optimization