Remove obsolete back-ends and simplify the options

It is time to clean up the mess of back-ends.

Remove all the obsolete back-ends and simplify the options used
to select them.

New Option  Old Equivalent
----------  --------------
ber         ber_bin,optimize,nif
per         per,optimize,nif
uper        uper_bin

The old options will still be recognized and translated to the
new options, but will also print a warning.

That implies that deprecated features that only are implemented
in the old 'ber' back-end will no longer work (e.g. the
{Typename,Value} notation).

Also make the return type for the generated encode/2 function
consistent. It used to be a binary for per and uper, and an iolist
for ber. Always make it a binary.

24 files changed, 135 insertions, 312 deletions

diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index b4329e9667..4cdf394cb4 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -21,27 +21,17 @@
 -module(asn1_SUITE).
 
 -define(only_per(Func),
-    if  Rule == per orelse Rule == per_bin -> Func;
-        true                               -> ok
+    if Rule =:= per -> Func;
+       true -> ok
     end).
 -define(only_ber(Func),
-    if  Rule == ber orelse Rule == ber_bin orelse Rule == ber_bin_v2 -> Func;
-        true                                                         -> ok
+    if Rule =:= ber -> Func;
+       true -> ok
     end).
 -define(only_uper(Func),
     case Rule of
-        uper_bin -> Func;
-        _        -> ok
-    end).
--define(only_per_nif(Func),
-    case {Rule, lists:member(optimize, Opts)} of
-        {per_bin, true} -> Func;
-        _               -> ok
-    end).
--define(only_ber_nif(Func),
-    case {Rule, lists:member(nif, Opts)} of
-        {ber_bin_v2, true} -> Func;
-        _               -> ok
+        uper -> Func;
+        _ -> ok
     end).
 
 -compile(export_all).
@@ -55,7 +45,8 @@
 suite() -> [{ct_hooks, [ts_install_cth]}].
 
 all() ->
-    [{group, parallel},
+    [{group, compile},
+     {group, parallel},
      {group, app_test},
      {group, appup_test},
 
@@ -83,8 +74,7 @@ groups() ->
      {appup_test, [], [{asn1_appup_test, all}]},
 
      {parallel, parallel([]),
-      [{group, compile},
-       {group, ber},
+      [{group, ber},
        % Uses 'P-Record', 'Constraints', 'MEDIA-GATEWAY-CONTROL'...
        {group, [], [parse,
                     test_driver_load,
@@ -202,13 +192,8 @@ groups() ->
 
      {performance, [],
       [testTimer_ber,
-       testTimer_ber_bin,
-       testTimer_ber_bin_opt,
-       testTimer_ber_bin_opt_driver,
        testTimer_per,
-       testTimer_per_bin,
-       testTimer_per_bin_opt,
-       testTimer_uper_bin,
+       testTimer_uper,
        smp]}].
 
 parallel(Options) ->
@@ -256,14 +241,8 @@ end_per_testcase(_Func, Config) ->
 
 test(Config, TestF) ->
     test(Config, TestF, [per,
-                         per_bin,
-                         {per_bin, [optimize]},
-                         uper_bin,
-                         ber,
-                         ber_bin,
-                         ber_bin_v2,
-                         % TODO: {ber_bin_v2, [optimize, nif]} ?
-                         {ber_bin_v2, [nif]}]).
+                         uper,
+                         ber]).
 
 test(Config, TestF, Rules) ->
     Fun = fun(C, R, O) ->
@@ -343,10 +322,10 @@ testCompactBitString(Config, Rule, Opts) ->
     testCompactBitString:compact_bit_string(Rule),
     ?only_uper(testCompactBitString:bit_string_unnamed(Rule)),
     ?only_per(testCompactBitString:bit_string_unnamed(Rule)),
-    ?only_per_nif(testCompactBitString:ticket_7734(Rule)),
-    ?only_per_nif(asn1_test_lib:compile("Constraints", Config,
+    ?only_per(testCompactBitString:ticket_7734(Rule)),
+    ?only_per(asn1_test_lib:compile("Constraints", Config,
                                         [Rule, compact_bit_string|Opts])),
-    ?only_per_nif(testCompactBitString:otp_4869(Rule)).
+    ?only_per(testCompactBitString:otp_4869(Rule)).
 
 testPrimStrings(Config) -> test(Config, fun testPrimStrings/3).
 testPrimStrings(Config, Rule, Opts) ->
@@ -370,10 +349,10 @@ testPrimExternal(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(["External", "PrimExternal"], Config,
                               [Rule|Opts]),
     testPrimExternal:external(Rule),
-    ?only_ber_nif(asn1_test_lib:compile_all(["PrimStrings", "BitStr"], Config,
+    ?only_ber(asn1_test_lib:compile_all(["PrimStrings", "BitStr"], Config,
                                             [Rule|Opts])),
-    ?only_ber_nif(testPrimStrings_cases(Rule)),
-    ?only_ber_nif(testPrimStrings:more_strings(Rule)).
+    ?only_ber(testPrimStrings_cases(Rule)),
+    ?only_ber(testPrimStrings:more_strings(Rule)).
 
 testChoPrim(Config) -> test(Config, fun testChoPrim/3).
 testChoPrim(Config, Rule, Opts) ->
@@ -398,7 +377,7 @@ testChoOptional(Config, Rule, Opts) ->
 
 testChoOptionalImplicitTag(Config) ->
     test(Config, fun testChoOptionalImplicitTag/3,
-             [ber, ber_bin, ber_bin_v2]).
+	 [ber]).
 testChoOptionalImplicitTag(Config, Rule, Opts) ->
     %% Only meaningful for ber & co
     asn1_test_lib:compile("ChoOptionalImplicitTag", Config, [Rule|Opts]),
@@ -514,8 +493,7 @@ testSeqOfCho(Config, Rule, Opts) ->
     testSeqOfCho:main(Rule).
 
 testSeqOfIndefinite(Config) ->
-    test(Config, fun testSeqOfIndefinite/3,
-             [ber, ber_bin, ber_bin_v2, {ber_bin_v2, [nif]}]).
+    test(Config, fun testSeqOfIndefinite/3, [ber]).
 testSeqOfIndefinite(Config, Rule, Opts) ->
     Files = ["Mvrasn-Constants-1", "Mvrasn-DataTypes-1", "Mvrasn-21-4",
              "Mvrasn-20-4", "Mvrasn-19-4", "Mvrasn-18-4", "Mvrasn-17-4",
@@ -631,13 +609,12 @@ c_syntax(Config) ->
              "SeqBadComma"]].
 
 c_string(Config) ->
-    test(Config, fun c_string/3, [per, per_bin, ber, ber_bin, ber_bin_v2]).
+    test(Config, fun c_string/3, [per, ber]).
 c_string(Config, Rule, Opts) ->
     asn1_test_lib:compile("String", Config, [Rule|Opts]).
 
 c_implicit_before_choice(Config) ->
-    test(Config, fun c_implicit_before_choice/3,
-             [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun c_implicit_before_choice/3, [ber]).
 c_implicit_before_choice(Config, Rule, Opts) ->
     DataDir = ?config(data_dir, Config),
     CaseDir = ?config(case_dir, Config),
@@ -648,12 +625,13 @@ parse(Config) ->
     [asn1_test_lib:compile(M, Config, [abs]) || M <- test_modules()].
 
 per(Config) ->
-    test(Config, fun per/3, [per, per_bin, {per_bin, [optimize]}]).
+    test(Config, fun per/3, [per]).
 per(Config, Rule, Opts) ->
     [module_test(M, Config, Rule, Opts) || M <- per_modules()].
 
 ber_other(Config) ->
-    test(Config, fun ber_other/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun ber_other/3, [ber]).
+
 ber_other(Config, Rule, Opts) ->
     [module_test(M, Config, Rule, Opts) || M <- ber_modules()].
 
@@ -668,12 +646,12 @@ module_test(M, Config, Rule, Opts) ->
 
 
 ber_choiceinseq(Config) ->
-    test(Config, fun ber_choiceinseq/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun ber_choiceinseq/3, [ber]).
 ber_choiceinseq(Config, Rule, Opts) ->
     asn1_test_lib:compile("ChoiceInSeq", Config, [Rule|Opts]).
 
 ber_optional(Config) ->
-    test(Config, fun ber_optional/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun ber_optional/3, [ber]).
 ber_optional(Config, Rule, Opts) ->
     asn1_test_lib:compile("SOpttest", Config, [Rule|Opts]),
     V = {'S', {'A', 10, asn1_NOVALUE, asn1_NOVALUE},
@@ -718,7 +696,7 @@ value_bad_enum_test(Config) ->
     end.
 
 constructed(Config) ->
-    test(Config, fun constructed/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun constructed/3, [ber]).
 constructed(Config, Rule, Opts) ->
     asn1_test_lib:compile("Constructed", Config, [Rule|Opts]),
     {ok, B} = asn1_wrapper:encode('Constructed', 'S', {'S', false}),
@@ -729,7 +707,7 @@ constructed(Config, Rule, Opts) ->
     [136, 1, 10] = lists:flatten(B2).
 
 ber_decode_error(Config) ->
-    test(Config, fun ber_decode_error/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun ber_decode_error/3, [ber]).
 ber_decode_error(Config, Rule, Opts) ->
     asn1_test_lib:compile("Constructed", Config, [Rule|Opts]),
     ber_decode_error:run(Opts).
@@ -742,14 +720,14 @@ h323test(Config, Rule, Opts) ->
     h323test:run(Rule).
 
 per_GeneralString(Config) ->
-    test(Config, fun per_GeneralString/3, [per, per_bin]).
+    test(Config, fun per_GeneralString/3, [per]).
 per_GeneralString(Config, Rule, Opts) ->
     asn1_test_lib:compile("MULTIMEDIA-SYSTEM-CONTROL", Config, [Rule|Opts]),
     UI = [109, 64, 1, 57],
     {ok, _V} = asn1_wrapper:decode('MULTIMEDIA-SYSTEM-CONTROL',
                                    'MultimediaSystemControlMessage', UI).
 
-per_open_type(Config) -> test(Config, fun per_open_type/3, [per, per_bin]).
+per_open_type(Config) -> test(Config, fun per_open_type/3, [per]).
 per_open_type(Config, Rule, Opts) ->
     asn1_test_lib:compile("OpenType", Config, [Rule|Opts]),
     {ok, _} = asn1ct:test('OpenType', 'Ot', {'Stype', 10, true}).
@@ -762,24 +740,24 @@ testConstraints(Config, Rule, Opts) ->
 
 
 testSeqIndefinite(Config) ->
-    test(Config, fun testSeqIndefinite/3, [ber, ber_bin, ber_bin_v2,
-                                               {ber_bin_v2, [nif]}]).
+    test(Config, fun testSeqIndefinite/3, [ber]).
+
 testSeqIndefinite(Config, Rule, Opts) ->
     asn1_test_lib:compile("SeqSetIndefinite", Config, [Rule|Opts]),
     testSeqIndefinite:main(Rule).
 
 
 testSetIndefinite(Config) ->
-    test(Config, fun testSetIndefinite/3, [ber, ber_bin, ber_bin_v2,
-                                               {ber_bin_v2, [nif]}]).
+    test(Config, fun testSetIndefinite/3, [ber]).
+
 testSetIndefinite(Config, Rule, Opts) ->
     asn1_test_lib:compile("SeqSetIndefinite", Config, [Rule|Opts]),
     testSetIndefinite:main(Rule).
 
 
 testChoiceIndefinite(Config) ->
-    test(Config, fun testChoiceIndefinite/3, [ber, ber_bin, ber_bin_v2,
-                                                  {ber_bin_v2, [nif]}]).
+    test(Config, fun testChoiceIndefinite/3, [ber]).
+
 testChoiceIndefinite(Config, Rule, Opts) ->
     asn1_test_lib:compile("ChoiceIndef", Config, [Rule|Opts]),
     testChoiceIndefinite:main(Rule).
@@ -841,7 +819,7 @@ testExport(Config) ->
     end.
 
 testImport(Config) ->
-    test(Config, fun testImport/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun testImport/3, [ber]).
 testImport(Config, Rule, Opts) ->
     {error, _} = asn1ct:compile(filename:join(?config(data_dir, Config),
                                               "ImportsFrom"),
@@ -890,8 +868,7 @@ duplicate_tags(Config) ->
             {skip, "Runs in asn1_SUITE only"}
     end.
 
-rtUI(Config) -> test(Config, fun rtUI/3, [per, per_bin, ber,
-            ber_bin, ber_bin_v2]).
+rtUI(Config) -> test(Config, fun rtUI/3, [per,ber]).
 rtUI(Config, Rule, Opts) ->
     asn1_test_lib:compile("Prim", Config, [Rule|Opts]),
     {ok, _} = asn1rt:info('Prim').
@@ -907,19 +884,19 @@ testINSTANCE_OF(Config, Rule, Opts) ->
     testINSTANCE_OF:main(Rule).
 
 testTCAP(Config) ->
-    test(Config, fun testTCAP/3,
-             [ber, ber_bin, ber_bin_v2, {ber_bin_v2, [nif]}]).
+    test(Config, fun testTCAP/3, [ber]).
 testTCAP(Config, Rule, Opts) ->
     testTCAP:compile(Config, [Rule|Opts]),
     testTCAP:test(Rule, Config),
     case Rule of
-        ber_bin_v2 -> testTCAP:compile_asn1config(Config, [Rule, asn1config]),
-                      testTCAP:test_asn1config();
-        _          -> ok
+        ber ->
+	    testTCAP:compile_asn1config(Config, [Rule, asn1config]),
+	    testTCAP:test_asn1config();
+        _ -> ok
     end.
 
 testDER(Config) ->
-    test(Config, fun testDER/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun testDER/3, [ber]).
 testDER(Config, Rule, Opts) ->
     asn1_test_lib:compile("DERSpec", Config, [Rule, der|Opts]),
     testDER:test(),
@@ -929,7 +906,7 @@ testDER(Config, Rule, Opts) ->
     testSeqSetDefaultVal:main(Rule).
 
 specialized_decodes(Config) ->
-    test(Config, fun specialized_decodes/3, [ber_bin_v2]).
+    test(Config, fun specialized_decodes/3, [ber]).
 specialized_decodes(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(["PartialDecSeq.asn",
                                "PartialDecSeq2.asn",
@@ -937,13 +914,12 @@ specialized_decodes(Config, Rule, Opts) ->
                                "PartialDecMyHTTP.asn",
                                "MEDIA-GATEWAY-CONTROL.asn",
                                "P-Record"],
-                              Config, [Rule, optimize, asn1config|Opts]),
+                              Config, [Rule, asn1config|Opts]),
     test_partial_incomplete_decode:test(Config),
     test_selective_decode:test().
 
 special_decode_performance(Config) ->
-    test(Config, fun special_decode_performance/3,
-             [{ber_bin, [optimize]}, {ber_bin_v2, [optimize, nif]}]).
+    test(Config, fun special_decode_performance/3, [ber]).
 special_decode_performance(Config, Rule, Opts) ->
     Files = ["MEDIA-GATEWAY-CONTROL", "PartialDecSeq"],
     asn1_test_lib:compile_all(Files, Config, [Rule, asn1config|Opts]),
@@ -951,19 +927,19 @@ special_decode_performance(Config, Rule, Opts) ->
 
 
 test_driver_load(Config) ->
-    test(Config, fun test_driver_load/3, [{per_bin, [optimize]}]).
+    test(Config, fun test_driver_load/3, [per]).
 test_driver_load(Config, Rule, Opts) ->
     asn1_test_lib:compile("P-Record", Config, [Rule|Opts]),
     test_driver_load:test(5).
 
 test_ParamTypeInfObj(Config) ->
-    asn1_test_lib:compile("IN-CS-1-Datatypes", Config, [ber_bin]).
+    asn1_test_lib:compile("IN-CS-1-Datatypes", Config, [ber]).
 
 test_WS_ParamClass(Config) ->
-    asn1_test_lib:compile("InformationFramework", Config, [ber_bin]).
+    asn1_test_lib:compile("InformationFramework", Config, [ber]).
 
 test_Defed_ObjectIdentifier(Config) ->
-    asn1_test_lib:compile("UsefulDefinitions", Config, [ber_bin]).
+    asn1_test_lib:compile("UsefulDefinitions", Config, [ber]).
 
 testSelectionType(Config) -> test(Config, fun testSelectionType/3).
 testSelectionType(Config, Rule, Opts) ->
@@ -971,7 +947,7 @@ testSelectionType(Config, Rule, Opts) ->
     {ok, _}  = testSelectionTypes:test().
 
 testSSLspecs(Config) ->
-    test(Config, fun testSSLspecs/3, [ber, ber_bin, ber_bin_v2, {ber_bin_v2, [optimize]}]).
+    test(Config, fun testSSLspecs/3, [ber]).
 testSSLspecs(Config, Rule, Opts) ->
     ok = testSSLspecs:compile(Config,
                               [Rule, compact_bit_string, der|Opts]),
@@ -995,12 +971,12 @@ test_undecoded_rest(Config, Rule, Opts) ->
     ok = test_undecoded_rest:test([], Config),
     asn1_test_lib:compile("P-Record", Config, [Rule,undec_rest|Opts]),
     case Rule of
-        ber_bin_v2 -> ok;
+        ber -> ok;
         _ -> test_undecoded_rest:test(undec_rest, Config)
     end.
 
 test_inline(Config) ->
-    test(Config, fun test_inline/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun test_inline/3, [ber]).
 test_inline(Config, Rule, Opts) ->
     case code:which(asn1ct) of
         cover_compiled ->
@@ -1013,12 +989,11 @@ test_inline(Config, Rule, Opts) ->
     end.
 
 testTcapsystem(Config) ->
-    test(Config, fun testTcapsystem/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun testTcapsystem/3, [ber]).
 testTcapsystem(Config, Rule, Opts) ->
     testTcapsystem:compile(Config, [Rule|Opts]).
 
-testNBAPsystem(Config) -> test(Config, fun testNBAPsystem/3,
-        [per, per_bin, {per_bin, [optimize]}]).
+testNBAPsystem(Config) -> test(Config, fun testNBAPsystem/3, [per]).
 testNBAPsystem(Config, Rule, Opts) ->
     testNBAPsystem:compile(Config, [Rule|Opts]),
     testNBAPsystem:test(Rule, Config).
@@ -1052,20 +1027,19 @@ test_modified_x420(Config) ->
 testX420() ->
     [{timetrap,{minutes,90}}].
 testX420(Config) ->
-    test(Config, fun testX420/3, [ber, ber_bin, ber_bin_v2]).
+    test(Config, fun testX420/3, [ber]).
 testX420(Config, Rule, Opts) ->
     testX420:compile(Rule, [der|Opts], Config),
     ok = testX420:ticket7759(Rule, Config),
     testX420:compile(Rule, Opts, Config).
 
 test_x691(Config) ->
-    test(Config, fun test_x691/3,
-             [per, per_bin, uper_bin, {per_bin, [optimize]}]).
+    test(Config, fun test_x691/3, [per, uper]).
 test_x691(Config, Rule, Opts) ->
     Files = ["P-RecordA1", "P-RecordA2", "P-RecordA3"],
     asn1_test_lib:compile_all(Files, Config, [Rule|Opts]),
     test_x691:cases(Rule, case Rule of
-                              uper_bin -> unaligned;
+                              uper -> unaligned;
                               _ -> aligned
                           end),
     asn1_test_lib:ticket_7708(Config, []),
@@ -1076,8 +1050,7 @@ ticket_6143(Config) ->
 
 testExtensionAdditionGroup(Config) ->
     %% FIXME problems with automatic tags [ber_bin], [ber_bin, optimize]
-    test(Config, fun testExtensionAdditionGroup/3,
-             [per_bin, {per_bin, [optimize]}, uper_bin]).
+    test(Config, fun testExtensionAdditionGroup/3, [per, uper]).
 testExtensionAdditionGroup(Config, Rule, Opts) ->
     asn1_test_lib:compile("Extension-Addition-Group", Config, [Rule|Opts]),
     asn1_test_lib:compile_erlang("extensionAdditionGroup", Config,
@@ -1166,46 +1139,17 @@ timer_compile(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(["H235-SECURITY-MESSAGES", "H323-MESSAGES"],
                               Config, [Rule|Opts]).
 
-testTimer_ber(suite) -> [];
 testTimer_ber(Config) ->
     timer_compile(Config,ber,[]),
     testTimer:go(Config,ber).
 
-testTimer_ber_bin(suite) -> [];
-testTimer_ber_bin(Config) ->
-    timer_compile(Config,ber_bin,[]),
-    testTimer:go(Config,ber_bin).
-
-testTimer_ber_bin_opt(suite) -> [];
-testTimer_ber_bin_opt(Config) ->
-    timer_compile(Config,ber_bin,[optimize]),
-    testTimer:go(Config,ber_bin).
-
-testTimer_ber_bin_opt_driver(suite) -> [];
-testTimer_ber_bin_opt_driver(Config) ->
-    timer_compile(Config,ber_bin,[optimize,driver]),
-    testTimer:go(Config,ber_bin).
-
-testTimer_per(suite) -> [];
 testTimer_per(Config) ->
     timer_compile(Config,per,[]),
     testTimer:go(Config,per).
 
-testTimer_per_bin(suite) -> [];
-testTimer_per_bin(Config) ->
-    timer_compile(Config,per_bin,[]),
-    testTimer:go(Config,per_bin).
-
-testTimer_per_bin_opt(suite) -> [];
-testTimer_per_bin_opt(Config) ->
-    timer_compile(Config,per_bin,[optimize]),
-    testTimer:go(Config,per_bin).
-
-
-testTimer_uper_bin(suite) -> [];
-testTimer_uper_bin(Config) ->
-    timer_compile(Config,uper_bin,[]),
-    {comment,_} = testTimer:go(Config,uper_bin).
+testTimer_uper(Config) ->
+    timer_compile(Config,uper,[]),
+    {comment,_} = testTimer:go(Config,uper).
 
 %% Test of multiple-line comment, OTP-8043
 testComment(suite) -> [];
@@ -1248,11 +1192,11 @@ testName2Number(Config) ->
     ok.
 
 ticket_7407(Config) ->
-    asn1_test_lib:compile("EUTRA-extract-7407", Config, [uper_bin]),
+    asn1_test_lib:compile("EUTRA-extract-7407", Config, [uper]),
     asn1_test_lib:ticket_7407_code(true),
 
     asn1_test_lib:compile("EUTRA-extract-7407", Config,
-                          [uper_bin, no_final_padding]),
+                          [uper, no_final_padding]),
     asn1_test_lib:ticket_7407_code(false).
 
 smp(suite) -> [];
@@ -1263,7 +1207,7 @@ smp(Config)  ->
             io:format("smp starting ~p workers\n",[NumOfProcs]),
 
             Msg = {initiatingMessage, testNBAPsystem:cell_setup_req_msg()},
-            ok = testNBAPsystem:compile(Config, [per_bin, optimize]),
+            ok = testNBAPsystem:compile(Config, [per]),
 
             enc_dec(NumOfProcs,Msg,2),
 
@@ -1272,7 +1216,7 @@ smp(Config)  ->
             {Time1,ok} = timer:tc(?MODULE,enc_dec,[NumOfProcs,Msg, N]),
             {Time1S,ok} = timer:tc(?MODULE,enc_dec,[1, Msg, NumOfProcs * N]),
 
-            ok = testNBAPsystem:compile(Config, [ber_bin, optimize, nif]),
+            ok = testNBAPsystem:compile(Config, [ber]),
             {Time3,ok} = timer:tc(?MODULE,enc_dec,[NumOfProcs,Msg, N]),
 
             {Time3S,ok} = timer:tc(?MODULE,enc_dec,[1, Msg, NumOfProcs * N]),
@@ -1293,10 +1237,8 @@ per_performance(Config) ->
     file:make_dir(NifDir),file:make_dir(ErlDir),
 
     Msg = {initiatingMessage, testNBAPsystem:cell_setup_req_msg()},
-    ok = testNBAPsystem:compile([{priv_dir,NifDir}|Config],
-                                      [per_bin, optimize]),
-    ok = testNBAPsystem:compile([{priv_dir,ErlDir}|Config],
-                                      [per_bin]),
+    ok = testNBAPsystem:compile([{priv_dir,NifDir}|Config], [per]),
+    ok = testNBAPsystem:compile([{priv_dir,ErlDir}|Config], [per]),
 
     Modules = ['NBAP-CommonDataTypes',
                'NBAP-Constants',
@@ -1334,7 +1276,7 @@ per_performance(Config) ->
 ber_performance(Config) ->
 
     Msg = {initiatingMessage, testNBAPsystem:cell_setup_req_msg()},
-    ok = testNBAPsystem:compile(Config, [ber_bin, optimize, nif]),
+    ok = testNBAPsystem:compile(Config, [ber]),
 
 
     BerFun = fun() ->
@@ -1508,7 +1450,7 @@ pforeach(_Fun,[],[]) ->
 -record('Iu-ReleaseCommand',{first,second}).
 
 ticket7904(Config) ->
-    asn1_test_lib:compile("RANAPextract1", Config, [per_bin, optimize]),
+    asn1_test_lib:compile("RANAPextract1", Config, [per]),
 
     Val1 = #'InitiatingMessage'{procedureCode=1,
                                 criticality=ignore,
diff --git a/lib/asn1/test/asn1_SUITE_data/PartialDecSeq.asn1config b/lib/asn1/test/asn1_SUITE_data/PartialDecSeq.asn1config
index 19fa3c990e..d388f6cd02 100644
--- a/lib/asn1/test/asn1_SUITE_data/PartialDecSeq.asn1config
+++ b/lib/asn1/test/asn1_SUITE_data/PartialDecSeq.asn1config
@@ -17,6 +17,6 @@
 	 {decode_D_incomplete,['D',[{a,undecoded}]]},
 	 {decode_F_fb_exclusive2,['F',[{fb,[{b,parts},{d,[{da,parts}]}]}]]},	     {decode_F_fb_exclusive3,['F',[{fb,[{b,parts},{d,[{da,parts},{dc,[{dcc,undecoded}]}]}]}]]}]}}.
 {module_name,'Seq.asn1'}.
-{compile_options,[ber_bin,optimize,debug_info]}.
+{compile_options,[ber,debug_info]}.
 {multifile_compile,['M1.asn','M2.asn']}.
 
diff --git a/lib/asn1/test/asn1_SUITE_data/testobj.erl b/lib/asn1/test/asn1_SUITE_data/testobj.erl
index be7ceee7d1..80942f7e38 100644
--- a/lib/asn1/test/asn1_SUITE_data/testobj.erl
+++ b/lib/asn1/test/asn1_SUITE_data/testobj.erl
@@ -1420,24 +1420,7 @@ wrapper_encode(Module,Type,Value) ->
 	    Error
     end.
 
-wrapper_decode(Module,Type,Bytes) ->
-    case Module:encoding_rule() of
-	ber ->
-	    asn1rt:decode(Module,Type,Bytes);
-	ber_bin when binary(Bytes) ->
-	    asn1rt:decode(Module,Type,Bytes);
-	ber_bin ->
-	    asn1rt:decode(Module,Type,list_to_binary(Bytes));
-	ber_bin_v2 when binary(Bytes) ->
-	    asn1rt:decode(Module,Type,Bytes);
-	ber_bin_v2 ->
-	    asn1rt:decode(Module,Type,list_to_binary(Bytes));
-	per ->
-	    asn1rt:decode(Module,Type,Bytes);
-	per_bin when binary(Bytes) ->
-	    asn1rt:decode(Module,Type,Bytes);
-	per_bin ->
-	    asn1rt:decode(Module,Type,list_to_binary(Bytes));
-	uper_bin ->
-	    asn1rt:decode(Module,Type,list_to_binary(Bytes))
-    end.
+wrapper_decode(Module, Type, Bytes) when is_binary(Bytes) ->
+    asn1rt:decode(Module, Type, Bytes);
+wrapper_decode(Module, Type, Bytes) when is_list(Bytes) ->
+    asn1rt:decode(Module, Type, list_to_binary(Bytes)).
diff --git a/lib/asn1/test/asn1_test_lib.erl b/lib/asn1/test/asn1_test_lib.erl
index 96c04a9436..fda635d0eb 100644
--- a/lib/asn1/test/asn1_test_lib.erl
+++ b/lib/asn1/test/asn1_test_lib.erl
@@ -87,14 +87,14 @@ ticket_7407_compile(Config,Option) ->
     ?line OutDir = ?config(priv_dir,Config),
 
     ?line ok = asn1ct:compile(DataDir ++ "EUTRA-extract-7407",
-			      [uper_bin, {outdir,OutDir}]++Option).
+			      [uper, {outdir,OutDir}]++Option).
 
 ticket_7708(Config,Option) ->
     ?line DataDir = ?config(data_dir,Config),
     ?line OutDir = ?config(priv_dir,Config),
     
     ?line ok = asn1ct:compile(DataDir ++ "EUTRA-extract-55",
-			      [uper_bin, {outdir,OutDir}]++Option).
+			      [uper, {outdir,OutDir}]++Option).
     
 
 ticket_7407_code(FinalPadding) ->
@@ -154,7 +154,7 @@ ticket_7678(Config, Option) ->
     ?line OutDir = ?config(priv_dir,Config),
 
     ?line ok = asn1ct:compile(DataDir ++ "UPERDefault",
-			      [uper_bin, {outdir,OutDir}]++Option),
+			      [uper, {outdir,OutDir}]++Option),
     
     ?line Val = 'UPERDefault':seq(),
     ?line {ok,<<0,6,0>>} = 'UPERDefault':encode('Seq',Val),
@@ -167,12 +167,12 @@ ticket_7763(Config) ->
     ?line OutDir = ?config(priv_dir,Config),
 
     ?line ok = asn1ct:compile(DataDir ++ "EUTRA-extract-55",
-			      [uper_bin, {outdir,OutDir}]),
+			      [uper, {outdir,OutDir}]),
     Val = {'Seq',15,lists:duplicate(8,0),[0],lists:duplicate(28,0),15,true},
     ?line {ok,Bin} = 'EUTRA-extract-55':encode('Seq',Val),
 
     ?line ok = asn1ct:compile(DataDir ++ "EUTRA-extract-55",
-			      [uper_bin,compact_bit_string,{outdir,OutDir}]),
+			      [uper,compact_bit_string,{outdir,OutDir}]),
     CompactVal = {'Seq',15,{0,<<0>>},{7,<<0>>},{4,<<0,0,0,0>>},15,true},
     {ok,CompactBin} = 'EUTRA-extract-55':encode('Seq',CompactVal),
 
diff --git a/lib/asn1/test/asn1_wrapper.erl b/lib/asn1/test/asn1_wrapper.erl
index d515b99ac2..e764d8b4ca 100644
--- a/lib/asn1/test/asn1_wrapper.erl
+++ b/lib/asn1/test/asn1_wrapper.erl
@@ -34,41 +34,16 @@ encode(Module,Type,Value) ->
 	    Error
     end.
 
-decode(Module,Type,Bytes) ->
-    case Module:encoding_rule() of
-	ber ->
-	    asn1rt:decode(Module,Type,Bytes);
-	ber_bin when is_binary(Bytes) ->
-	    asn1rt:decode(Module,Type,Bytes);
-	ber_bin ->
-	    asn1rt:decode(Module,Type,list_to_binary(Bytes));
-	ber_bin_v2 when is_binary(Bytes) ->
-	    asn1rt:decode(Module,Type,Bytes);
-	ber_bin_v2 ->
-	    asn1rt:decode(Module,Type,list_to_binary(Bytes));
-	per ->
-	    asn1rt:decode(Module,Type,Bytes);
-	per_bin when is_binary(Bytes) ->
-	    asn1rt:decode(Module,Type,Bytes);
-	per_bin ->
-	    asn1rt:decode(Module,Type,list_to_binary(Bytes));
-	uper_bin when is_binary(Bytes) ->
-	    asn1rt:decode(Module,Type,Bytes);
-	uper_bin ->
-	    asn1rt:decode(Module,Type,list_to_binary(Bytes))
-    end.
+decode(Module, Type, Bytes) when is_binary(Bytes) ->
+    asn1rt:decode(Module, Type, Bytes);
+decode(Module, Type, Bytes) when is_list(Bytes) ->
+    asn1rt:decode(Module, Type, list_to_binary(Bytes)).
 
 erule(ber) ->
     ber;
-erule(ber_bin) ->
-    ber;
-erule(ber_bin_v2) ->
-    ber;
 erule(per) ->
     per;
-erule(per_bin) ->
-    per;
-erule(uper_bin) ->
+erule(uper) ->
     per.
 
 
diff --git a/lib/asn1/test/h323test.erl b/lib/asn1/test/h323test.erl
index b7a7d6e4df..426ae16994 100644
--- a/lib/asn1/test/h323test.erl
+++ b/lib/asn1/test/h323test.erl
@@ -22,7 +22,6 @@
 -export([run/1]).
 -include_lib("test_server/include/test_server.hrl").
 
-run(per_bin) -> run();
 run(per)     -> run();
 run(_Rules)  -> ok.
 
diff --git a/lib/asn1/test/testChoiceIndefinite.erl b/lib/asn1/test/testChoiceIndefinite.erl
index 630efcf27a..b5832c985a 100644
--- a/lib/asn1/test/testChoiceIndefinite.erl
+++ b/lib/asn1/test/testChoiceIndefinite.erl
@@ -23,12 +23,7 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
-main(per_bin) -> ok;
 main(per) -> ok;
-main(ber_bin_v2) ->
-    main(ber);
-main(ber_bin) ->
-    main(ber);
 main(ber) ->
     %% Test case related to OTP-4358
     %% normal encoding
diff --git a/lib/asn1/test/testCompactBitString.erl b/lib/asn1/test/testCompactBitString.erl
index 9563a31bf3..db102a3bda 100644
--- a/lib/asn1/test/testCompactBitString.erl
+++ b/lib/asn1/test/testCompactBitString.erl
@@ -233,7 +233,7 @@ compact_bit_string(Rules) ->
     
     ok.
 
-ticket_7734(per_bin) ->
+ticket_7734(per) ->
     ?line BS = {0,list_to_binary(lists:duplicate(128,0))},
     ?line {ok,BSEnc} = asn1_wrapper:encode('PrimStrings','BS1024',BS),
     ?line {ok,BS} = asn1_wrapper:decode('PrimStrings','BS1024',BSEnc).
@@ -251,7 +251,7 @@ bit_string_unnamed(Rules) ->
 				    lists:flatten(Bytes1))
     end.
 
-otp_4869(per_bin) ->
+otp_4869(per) ->
     ?line Val1={'IP',[0],{0,<<62,235,90,50,0,0,0,0,0,0,0,0,0,0,0,0>>},asn1_NOVALUE},
     ?line Val2 = {'IP',[0],[0,0,1,1,1,1,1,0,1,1,1,0,1,0,1,1,0,1,0,1,1,0,1,0,0,0,1,1,0,0,1,0] ++ lists:duplicate(128 - 32,0),asn1_NOVALUE},
 
diff --git a/lib/asn1/test/testEnumExt.erl b/lib/asn1/test/testEnumExt.erl
index c97116413a..bb975a1d13 100644
--- a/lib/asn1/test/testEnumExt.erl
+++ b/lib/asn1/test/testEnumExt.erl
@@ -23,8 +23,8 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
-main(Rules) when Rules == per; Rules == per_bin; Rules == uper_bin ->
-    io:format("main(~p)~n",[Rules]),
+main(Rule) when Rule =:= per; Rule =:= uper ->
+    io:format("main(~p)~n",[Rule]),
     B32=[32],B64=[64],
     %% ENUMERATED with extensionmark (value is in root set)
     ?line {ok,B32} = asn1_wrapper:encode('EnumExt','Ext',red),
@@ -42,10 +42,6 @@ main(Rules) when Rules == per; Rules == per_bin; Rules == uper_bin ->
     ?line {ok,red} = asn1_wrapper:decode('EnumExt','Noext',B64),
     ok;
 
-main(ber_bin_v2) ->
-    main(ber);
-main(ber_bin) ->
-    main(ber);
 main(ber) ->
     io:format("main(ber)~n",[]),
     %% ENUMERATED with extensionmark (value is in root set)
diff --git a/lib/asn1/test/testINSTANCE_OF.erl b/lib/asn1/test/testINSTANCE_OF.erl
index 5986a00ec5..ce411beb92 100644
--- a/lib/asn1/test/testINSTANCE_OF.erl
+++ b/lib/asn1/test/testINSTANCE_OF.erl
@@ -26,7 +26,7 @@
 main(Erule) ->
 
     ?line {ok,Integer} = asn1_wrapper:encode('INSTANCEOF','Int',3),
-    Int = wrap(Erule,Integer),
+    Int = list_to_binary(Integer),
     ValotherName = {otherName,{'INSTANCE OF',{2,4},Int}},
     VallastName1 = {lastName,{'GeneralName_lastName',{2,4},12}},
     VallastName2 = {lastName,{'GeneralName_lastName',{2,3,4},
@@ -61,18 +61,3 @@ test_encdec(_Erule,{lastName,{'GeneralName_lastName',{2,3,4},
     ok;
 test_encdec(Erule,Res) ->
     {error,{Erule,Res}}.
-
-wrap(ber,Int) when is_list(Int) ->
-    binary_to_list(list_to_binary(Int));
-wrap(per,Int) when is_list(Int) ->
-    binary_to_list(list_to_binary(Int));
-wrap(ber_bin,Int) when is_list(Int) ->
-    list_to_binary(Int);
-wrap(ber_bin_v2,Int) when is_list(Int) ->
-    list_to_binary(Int);
-wrap(per_bin,Int) when is_list(Int) ->
-    list_to_binary(Int);
-wrap(uper_bin,Int) when is_list(Int) ->
-    list_to_binary(Int);
-wrap(_,Int) ->
-    Int.
diff --git a/lib/asn1/test/testInfObjectClass.erl b/lib/asn1/test/testInfObjectClass.erl
index e639066246..98408502c6 100644
--- a/lib/asn1/test/testInfObjectClass.erl
+++ b/lib/asn1/test/testInfObjectClass.erl
@@ -37,15 +37,12 @@ main(Rule) ->
 			{component,'ArgumentType'},
 			{value,_},_}}} = asn1_wrapper:encode('InfClass','Seq',
 						      {'Seq',12,13,1}),
-    Bytes2 =
-	if
-	    Rule==per;Rule==per_bin ->
-		[1,12,1,11,1,1];
-	    Rule == uper_bin ->
-		<<1,12,1,11,1,1>>;
-	    true ->
-		[48,9,2,1,12,2,1,11,2,1,1]
-	end,
+    Bytes2 = case Rule of
+		 ber ->
+		     <<48,9,2,1,12,2,1,11,2,1,1>>;
+		 _ ->
+		 <<1,12,1,11,1,1>>
+	     end,
     ?line {error,{asn1,{'Type not compatible with table constraint',
 			{{component,_},
 			 {value,_B},_}}}} = 
diff --git a/lib/asn1/test/testMergeCompile.erl b/lib/asn1/test/testMergeCompile.erl
index 31aa3518f6..d63df28c31 100644
--- a/lib/asn1/test/testMergeCompile.erl
+++ b/lib/asn1/test/testMergeCompile.erl
@@ -43,17 +43,11 @@ main(Erule) ->
     ?line EncVal = 
 	case Erule of
 	    per -> 
-		[1,100];
-	    per_bin -> 
 		<<1,100>>;
-	    uper_bin ->
+	    uper ->
 		<<1,100>>;
 	    ber ->
-		[2,1,1];
-	    ber_bin ->
-		<<2,1,1>>;
-	    ber_bin_v2 ->
-		<<2,1,1>>
+		[2,1,1]
 	end,
     ?line PEVal2 = [{dummy,1,ignore,EncVal},{dummy,2,reject,EncVal}],
     ?line Val2 = 
@@ -76,7 +70,7 @@ main(Erule) ->
 
 mvrasn(Erule) ->
     case Erule of
-	Ber when Ber == ber;Ber == ber_bin ->
+	ber ->
 	    ?line ok = test(isd),
 	    ?line ok = test(isd2),
 	    ?line ok = test(dsd),
diff --git a/lib/asn1/test/testParameterizedInfObj.erl b/lib/asn1/test/testParameterizedInfObj.erl
index 68faf08a61..6f53595132 100644
--- a/lib/asn1/test/testParameterizedInfObj.erl
+++ b/lib/asn1/test/testParameterizedInfObj.erl
@@ -98,7 +98,7 @@ ranap(_Erule) ->
     
     ok.
 
-open_type(uper_bin,Val) when is_list(Val) ->
+open_type(uper,Val) when is_list(Val) ->
     list_to_binary(Val);
 open_type(_,Val) ->
     Val.
diff --git a/lib/asn1/test/testSSLspecs.erl b/lib/asn1/test/testSSLspecs.erl
index 51ef134e5f..45c5da50f0 100644
--- a/lib/asn1/test/testSSLspecs.erl
+++ b/lib/asn1/test/testSSLspecs.erl
@@ -42,11 +42,11 @@ compile(Config, Options) ->
     asn1_test_lib:compile_all(["PKIX1Explicit93", "PKIX1Implicit93"],
                               Config, NewOptions).
 
-compile_inline(Config, Rule) when Rule == ber_bin; Rule == ber_bin_v2 ->
+compile_inline(Config, ber=Rule) ->
     DataDir = ?config(data_dir, Config),
     CaseDir = ?config(case_dir, Config),
     Options = [{i, CaseDir}, {i, DataDir}, Rule,
-               der, compact_bit_string, optimize, asn1config, inline],
+               der, compact_bit_string, asn1config, inline],
     ok = remove_db_file_inline(CaseDir),
     asn1_test_lib:compile("OTP-PKIX.set.asn", Config, Options);
 compile_inline(_Config, _Rule) ->
@@ -73,7 +73,7 @@ remove_db_file_inline(Dir) ->
     ?line ok = remove_db_file(Dir ++ "PKIX1Explicit88.asn1db"),
     ?line ok = remove_db_file(Dir ++ "PKIX1Implicit88.asn1db").
 
-run(BER) when BER==ber_bin;BER==ber_bin_v2 ->
+run(ber) ->
     run1(1);
 run(_) ->
     ok.
@@ -100,20 +100,20 @@ transform1(ATAV) ->
     ?line {ok, ATAVEnc} = 'PKIX1Explicit88':encode('AttributeTypeAndValue',
 ATAV),
     ?line {ok, _ATAVDec} = 'SSL-PKIX':decode('AttributeTypeAndValue',
-                                      list_to_binary(ATAVEnc)).
+                                      ATAVEnc).
 
 transform2(ATAV) ->
     ?line {ok, ATAVEnc} = 'PKIX1Explicit88':encode('AttributeTypeAndValue',
 ATAV),
     ?line {ok, _ATAVDec} = 'PKIX1Explicit88':decode('AttributeTypeAndValue',
-                                             list_to_binary(ATAVEnc)).
+                                             ATAVEnc).
 
 
 transform4(ATAV) ->
     ?line {ok, ATAVEnc} = 'PKIX1Explicit88':encode('Attribute',
 ATAV),
     ?line {ok, _ATAVDec} = 'PKIX1Explicit88':decode('Attribute',
-                                             list_to_binary(ATAVEnc)).
+                                             ATAVEnc).
 
 
 ex(1) ->
@@ -146,7 +146,7 @@ ex(7) ->
      {1,2,840,113549,1,9,1},
      [[19,5,111,116,112,67,65]]}.
 
-run_inline(Rule) when Rule==ber_bin;Rule==ber_bin_v2 ->
+run_inline(ber) ->
     Cert = cert(),
     ?line {ok,{'CertificatePKIX1Explicit88',{Type,UnDec},_,_}} = 'OTP-PKIX':decode_TBSCert_exclusive(Cert),
     ?line {ok,_} = 'OTP-PKIX':decode_part(Type,UnDec),
diff --git a/lib/asn1/test/testSeqIndefinite.erl b/lib/asn1/test/testSeqIndefinite.erl
index 25742474bb..c7b8aba523 100644
--- a/lib/asn1/test/testSeqIndefinite.erl
+++ b/lib/asn1/test/testSeqIndefinite.erl
@@ -23,13 +23,7 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
-
-main(per_bin) -> ok;
 main(per) -> ok;
-main(ber_bin_v2) ->
-    main(ber);
-main(ber_bin) ->
-    main(ber);
 main(ber) ->
     
     %% normal encoding
diff --git a/lib/asn1/test/testSeqOf.erl b/lib/asn1/test/testSeqOf.erl
index 89c9375c62..1aa1eab26d 100644
--- a/lib/asn1/test/testSeqOf.erl
+++ b/lib/asn1/test/testSeqOf.erl
@@ -201,7 +201,7 @@ main(Rules) ->
 
     %% tests of OTP-4590
     case Rules of
-	PER when PER == per; PER == per_bin ->
+	per ->
 	    DayNames = ["Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],
 	    ?line {ok,Bytes60} = asn1_wrapper:encode('XSeqOf','DayNames2',DayNames),
 	    ?line {ok,Bytes60} = asn1_wrapper:encode('XSeqOf','DayNames4',DayNames),
diff --git a/lib/asn1/test/testSetIndefinite.erl b/lib/asn1/test/testSetIndefinite.erl
index d8e2b6a9cf..73006da62b 100644
--- a/lib/asn1/test/testSetIndefinite.erl
+++ b/lib/asn1/test/testSetIndefinite.erl
@@ -24,12 +24,7 @@
 -include_lib("test_server/include/test_server.hrl").
 
 
-main(per_bin) -> ok;
 main(per) -> ok;
-main(ber_bin_v2) ->
-    main(ber);
-main(ber_bin) ->
-    main(ber);
 main(ber) ->
     
     %% normal encoding
diff --git a/lib/asn1/test/testSetOptional.erl b/lib/asn1/test/testSetOptional.erl
index 4692941524..cef90bc843 100644
--- a/lib/asn1/test/testSetOptional.erl
+++ b/lib/asn1/test/testSetOptional.erl
@@ -181,7 +181,7 @@ main(_Rules) ->
     ok.
 
 
-ticket_7533(Ber) when Ber == ber; Ber == ber_bin ->
+ticket_7533(Ber) when Ber == ber ->
     Val = #'SetOpt1'{bool1 = true,int1=12,set1=#'SetIn'{boolIn=false,intIn=13}},
     ?line {ok,B} = asn1_wrapper:encode('SetOptional','SetOpt1',Val),
     ?line {ok,Val} = asn1_wrapper:decode('SetOptional','SetOpt1',B),
diff --git a/lib/asn1/test/testTCAP.erl b/lib/asn1/test/testTCAP.erl
index 878ce7c070..b723995e40 100644
--- a/lib/asn1/test/testTCAP.erl
+++ b/lib/asn1/test/testTCAP.erl
@@ -37,7 +37,7 @@ compile_asn1config(Config, Options) ->
     asn1_test_lib:compile_all(Files, Config, Options),
     asn1_test_lib:compile_erlang("TCAPPackage_msg", Config, []).
 
-test(Erule,_Config) when Erule==ber;Erule==ber_bin;Erule==ber_bin_v2 ->
+test(ber=Erule,_Config) ->
 %    ?line OutDir = ?config(priv_dir,Config),
     %% testing OTP-4798, open type encoded with indefinite length
     ?line {ok,_Res} = asn1_wrapper:decode('TCAPMessages-simple','MessageType', val_OTP_4798(Erule)),
@@ -81,7 +81,7 @@ test_asn1config() ->
     
     ?line Val2 = 'TCAPPackage_msg':val('TransactionPDU'),
     ?line {ok,B2} = 'TCAPPackage':encode('TransactionPDU',Val2),
-    ?line {ok,ExMsg2}='TCAPPackage':decode_TransactionPDU(list_to_binary(B2)),
+    {ok,ExMsg2}='TCAPPackage':decode_TransactionPDU(B2),
     ?line {_,_,_,{Key2,ExVal2}}=ExMsg2,
     ?line {ok,_Parts2}='TCAPPackage':decode_part(Key2,ExVal2),
 
diff --git a/lib/asn1/test/testTimer.erl b/lib/asn1/test/testTimer.erl
index 2d3b777558..cd7ceb5630 100644
--- a/lib/asn1/test/testTimer.erl
+++ b/lib/asn1/test/testTimer.erl
@@ -133,23 +133,7 @@ go(Config,Enc) ->
     Module = 'H323-MESSAGES',
     Type = 'H323-UserInformation',
     Value = val(),
-%%    ok = asn1ct:compile(HelpModule,[Enc]),
-
-%%    ok = asn1ct:compile(Module,[Enc]),
-    ?line {ok,B} = asn1rt:encode(Module,Type,Value),
-    Bytes = case Enc of
-		ber_bin ->
-		    list_to_binary(B);
-		per_bin when is_list(B) ->
-		    list_to_binary(B);
-		per_bin ->
-		    B;
-		uper_bin ->
-		    B;
-		_ ->
-		    %%lists:flatten(B)
-		    list_to_binary(B)
-	    end,
+    {ok,Bytes} = asn1rt:encode(Module,Type,Value),
 
     CompileOptions = compile_options(),
     
@@ -181,35 +165,18 @@ encode(N, Module,Type,Value) ->
 decode(0, _Module,_Type,_Value,_Erule) ->
     done;
 decode(N, Module,Type,Value,Erule) ->
-    case Erule of
-	ber ->
-	    ?line {ok,_B} = asn1rt:decode(Module,Type,binary_to_list(Value));
-	per ->
-	    ?line {ok,_B} = asn1rt:decode(Module,Type,binary_to_list(Value));
-	_ ->
-	    ?line {ok,_B} = asn1rt:decode(Module,Type,Value)
-    end,
+    {ok,_B} = asn1rt:decode(Module,Type,Value),
     decode(N-1, Module,Type,Value,Erule).
 
 compile_options() ->
-    ?line {ok,Info} = asn1rt:info('H323-MESSAGES'),
-    case lists:keysearch(options,1,Info) of
-	{_,{_,Opts}} ->
-	    Opts2 = 
-		case lists:member(ber_bin_v2,Opts) of
-		    true ->
-			[ber_bin,optimize] ++ lists:delete(optimize,Opts);
-		    _ ->
-			Opts
-		end,
-	    Opts3 = [X||X <- Opts2,
-			(X == ber orelse
-			 X == ber_bin orelse
-			 X == per orelse
-			 X == per_bin orelse
-			 X == optimize orelse
-			 X == driver)],
-	    lists:flatten(io_lib:format("~p",[Opts3]));
+    {ok,Info} = asn1rt:info('H323-MESSAGES'),
+    case lists:keyfind(options, 1, Info) of
+	{_,Opts0} ->
+	    Opts1 = [X || X <- Opts0,
+			  (X =:= ber orelse
+			   X =:= per orelse
+			   X =:= uper)],
+	    lists:flatten(io_lib:format("~p", [Opts1]));
 	_ ->
 	    "[]"
     end.
diff --git a/lib/asn1/test/testX420.erl b/lib/asn1/test/testX420.erl
index abdbbfe536..52b20a2c70 100644
--- a/lib/asn1/test/testX420.erl
+++ b/lib/asn1/test/testX420.erl
@@ -34,7 +34,7 @@ compile(Erule, Options, Config) ->
 compile_loop(_Erule, [], _Options, _Config) ->
     ok;
 compile_loop(Erule, [Spec|Specs], Options, Config)
-  when Erule == ber; Erule == ber_bin; Erule == ber_bin_v2; Erule == per ->
+  when Erule =:= ber; Erule =:= per ->
     CaseDir = ?config(case_dir, Config),
     asn1_test_lib:compile(filename:join([x420, Spec]), Config,
                           [Erule, {i, CaseDir}]),
diff --git a/lib/asn1/test/test_compile_options.erl b/lib/asn1/test/test_compile_options.erl
index 4e732308d8..b973c5fbcc 100644
--- a/lib/asn1/test/test_compile_options.erl
+++ b/lib/asn1/test/test_compile_options.erl
@@ -92,7 +92,8 @@ noobj(Config) ->
     file:delete(filename:join([OutDir,'P-Record.beam'])),
     file:delete(filename:join([OutDir,'p_record.erl'])),
     file:delete(filename:join([OutDir,'p_record.beam'])),
-    ?line ok=asn1ct:compile(filename:join([DataDir,"p_record.set.asn"]),[asn1config,ber_bin,optimize,noobj,{outdir,OutDir}]),
+    ok = asn1ct:compile(filename:join([DataDir,"p_record.set.asn"]),
+			[asn1config,ber,noobj,{outdir,OutDir}]),
 %%     ?line false = code:is_loaded('P-Record'),
 %%     ?line false = code:is_loaded('p_record'),
     ?line {error,enoent} =
diff --git a/lib/asn1/test/test_inline.erl b/lib/asn1/test/test_inline.erl
index 62625572e3..e03ad739f9 100644
--- a/lib/asn1/test/test_inline.erl
+++ b/lib/asn1/test/test_inline.erl
@@ -41,16 +41,16 @@ inline1(Config, Rule, Opt) ->
     asn1_test_lib:compile("P-Record", Config, [{inline, 'inlined_P_Record'}|Opt]),
     test_inline1(),
 
-    ok=remove_inlined_files2(CaseDir, ber_bin_v2),
+    ok=remove_inlined_files2(CaseDir, ber),
 
     case Rule of
-        ber_bin_v2 ->
+        ber ->
             asn1_test_lib:compile("P-Record", Config,
-                                  [ber_bin, inline, asn1config, optimize|Opt]),
+                                  [ber, inline, asn1config|Opt]),
             test_inline2(Rule, 'P-Record'),
             remove_inlined_files3(CaseDir, Rule),
             asn1_test_lib:compile("p_record.set.asn", Config,
-                                  [ber_bin, inline, asn1config, optimize|Opt]),
+                                  [ber, inline, asn1config|Opt]),
             test_inline2(Rule, 'p_record'),
             remove_inlined_files4(CaseDir, Rule);
         _ ->
@@ -71,12 +71,12 @@ test_inline1() ->
     ?line {ok,_}=asn1_wrapper:decode('inlined_P_Record',
 				     'PersonnelRecord',Bytes).
 
-test_inline2(ber_bin_v2,Mod) ->
+test_inline2(ber,Mod) ->
     PRecMsg = {'PersonnelRecord',{'Name',"Sven","S","Svensson"},
 	       "manager",123,"20000202",{'Name',"Inga","K","Svensson"},
 	       asn1_DEFAULT},
     ?line {ok,Bytes} = Mod:encode('PersonnelRecord',PRecMsg),
-    ?line {ok,_} = Mod:sel_dec(list_to_binary(Bytes));
+    {ok,_} = Mod:sel_dec(Bytes);
 test_inline2(_,_) ->
     ok.
 
@@ -243,7 +243,7 @@ remove_inlined_files2(Dir,Rule) ->
 			  ?line ok=file:delete(X)
 		  end,[TargetErl,TargetBeam]),
     ok.
-remove_inlined_files3(Dir,ber_bin_v2) ->
+remove_inlined_files3(Dir,ber) ->
     Erl=filename:join([Dir,"P-Record.erl"]),
     Beam=filename:join([Dir,"P-Record.beam"]),
     Asn1DB=filename:join([Dir,"P-Record.asn1db"]),
@@ -255,7 +255,7 @@ remove_inlined_files3(Dir,ber_bin_v2) ->
 remove_inlined_files3(_,_) ->
     ok.
 
-remove_inlined_files4(Dir,ber_bin_v2) ->
+remove_inlined_files4(Dir,ber) ->
     Erl=filename:join([Dir,"p_record.erl"]),
     Beam=filename:join([Dir,"p_record.beam"]),
     Asn1DB=filename:join([Dir,"p_record.asn1db"]),
diff --git a/lib/asn1/test/test_special_decode_performance.erl b/lib/asn1/test/test_special_decode_performance.erl
index 4ac0ff2b27..dd56d29b28 100644
--- a/lib/asn1/test/test_special_decode_performance.erl
+++ b/lib/asn1/test/test_special_decode_performance.erl
@@ -33,7 +33,7 @@ go(all) ->
 go(N,Mod) ->
     ?line Val = val(Mod),
     ?line {ok,B} = Mod:encode(element(1,Val),Val),
-    ?line go(Mod,list_to_binary(B),N).
+    ?line go(Mod,B,N).
 
 go(Mod,Bin,N) ->
     ?line FsS = get_selective_funcs(Mod),