Merge "Remove unused permissions, libs"