issue 880: remove leftovers after NONBE_UNIFIED_DECODING_PATHS; under...

issue 880: remove leftovers after NONBE_UNIFIED_DECODING_PATHS; under UNIFIED_DECODING_PATHS_LEFTOVERS