Removing some calls to `sudo`