issue 759: remove obsolete code in the OSBA encoder + harmonize duplicated...

issue 759: remove obsolete code in the OSBA encoder + harmonize duplicated code; under FIX_759_CODE_COVERAGE_OSBA