Simplify beta features visibility
Fix exception resource leak CID 18093