Merge "Remove now-unused permissions"