Cleanup + fixed opt-out: bool