Merge "Remove Restrictions UI"