removed flags-aware versions