Merge "Remove unneeded permissions"