Updated the permission model to remove unused annotations.