Updating removePermissions with some TODOs