remove double ; in several places