Remove use of private selector in production builds