Tweak visibility of members
Cosmetics
Remove annotations from class not intended for auto-scanning.