Cleanup around VisibilityTrait