tidy up usage of feature-flags-client