remove some uses [firstorder]