Cleanup and hardening of User-Restricted Resource Access