@@ -534,11 +534,5 @@ public static string[] ListAssemblies(bool verbose)
             }
             return names;
         }
-
-        [ModuleFunction]
-        public static int _AtExit()
-        {
-            return Runtime.AtExit();
-        }
     }
 }
@@ -147,7 +147,6 @@ static void ValidateRequiredOffsetsPresent(PropertyInfo[] offsetProperties)
             {
                 "__instancecheck__",
                 "__subclasscheck__",
-                "_AtExit",
                 "AddReference",
                 "FinalizeObject",
                 "FindAssembly",
 
@@ -198,18 +198,6 @@ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true,
                 Py.SetArgv(args);
             }
 
-            if (mode == ShutdownMode.Normal)
-            {
-                // TOOD: Check if this can be remove completely or not.
-                // register the atexit callback (this doesn't use Py_AtExit as the C atexit
-                // callbacks are called after python is fully finalized but the python ones
-                // are called while the python engine is still running).
-                //string code =
-                //    "import atexit, clr\n" +
-                //    "atexit.register(clr._AtExit)\n";
-                //PythonEngine.Exec(code);
-            }
-
             // Load the clr.py resource into the clr module
             NewReference clr = Python.Runtime.ImportHook.GetCLRModule();
             BorrowedReference clr_dict = Runtime.PyModule_GetDict(clr);
 
@@ -391,7 +391,9 @@ internal static void Shutdown(ShutdownMode mode)
             {
                 ResetPyMembers();
                 if (mode != ShutdownMode.Extension)
+                {
                     Py_Finalize();
+                }
             }
         }
 
@@ -416,16 +418,6 @@ internal static ShutdownMode GetDefaultShutdownMode()
             return ShutdownMode.Normal;
         }
 
-        // called *without* the GIL acquired by clr._AtExit
-        internal static int AtExit()
-        {
-            lock (IsFinalizingLock)
-            {
-                IsFinalizing = true;
-            }
-            return 0;
-        }
-
         private static void RunExitFuncs()
         {
             PyObject atexit;
Original file line number	Diff line number	Diff line change
`@@ -534,11 +534,5 @@ public static string[] ListAssemblies(bool verbose)`
`534`	`534`	`}`
`535`	`535`	`return names;`
`536`	`536`	`}`
`537`		`-`
`538`		`- [ModuleFunction]`
`539`		`- public static int _AtExit()`
`540`		`- {`
`541`		`- return Runtime.AtExit();`
`542`		`- }`
`543`	`537`	`}`
`544`	`538`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,6 @@ static void ValidateRequiredOffsetsPresent(PropertyInfo[] offsetProperties)`
`147`	`147`	`{`
`148`	`148`	`"__instancecheck__",`
`149`	`149`	`"__subclasscheck__",`
`150`		`- "_AtExit",`
`151`	`150`	`"AddReference",`
`152`	`151`	`"FinalizeObject",`
`153`	`152`	`"FindAssembly",`
Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,9 @@ internal static void Shutdown(ShutdownMode mode)`
`391`	`391`	`{`
`392`	`392`	`ResetPyMembers();`
`393`	`393`	`if (mode != ShutdownMode.Extension)`
	`394`	`+ {`
`394`	`395`	`Py_Finalize();`
	`396`	`+ }`
`395`	`397`	`}`
`396`	`398`	`}`
`397`	`399`
`@@ -416,16 +418,6 @@ internal static ShutdownMode GetDefaultShutdownMode()`
`416`	`418`	`return ShutdownMode.Normal;`
`417`	`419`	`}`
`418`	`420`
`419`		`- // called without the GIL acquired by clr._AtExit`
`420`		`- internal static int AtExit()`
`421`		`- {`
`422`		`- lock (IsFinalizingLock)`
`423`		`- {`
`424`		`- IsFinalizing = true;`
`425`		`- }`
`426`		`- return 0;`
`427`		`- }`
`428`		`-`
`429`	`421`	`private static void RunExitFuncs()`
`430`	`422`	`{`
`431`	`423`	`PyObject atexit;`