And remove some more sudos