diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,9 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].

### Changed
-   Drop support for Python 2

### Fixed


diff --git a/src/embed_tests/pyimport.cs b/src/embed_tests/pyimport.cs
@@ -38,8 +38,8 @@ public void SetUp()
            string testPath = Path.Combine(TestContext.CurrentContext.TestDirectory, s);

            IntPtr str = Runtime.Runtime.PyString_FromString(testPath);
-            IntPtr path = Runtime.Runtime.PySys_GetObject("path");
-            Runtime.Runtime.PyList_Append(new BorrowedReference(path), str);
        }

        [TearDown]
@@ -83,5 +83,28 @@ public void TestCastGlobalVar()
            Assert.AreEqual("2", foo.FOO.ToString());
            Assert.AreEqual("2", foo.test_foo().ToString());
        }
    }
}
diff --git a/src/runtime/exceptions.cs b/src/runtime/exceptions.cs
@@ -254,9 +254,9 @@ public static void SetError(IntPtr ob, string value)
        /// Sets the current Python exception given a Python object.
        /// This is a wrapper for the Python PyErr_SetObject call.
        /// </remarks>
-        public static void SetError(IntPtr ob, IntPtr value)
        {
-            Runtime.PyErr_SetObject(ob, value);
        }

        /// <summary>
@@ -286,7 +286,7 @@ public static void SetError(Exception e)

            IntPtr op = CLRObject.GetInstHandle(e);
            IntPtr etype = Runtime.PyObject_GetAttrString(op, "__class__");
-            Runtime.PyErr_SetObject(etype, op);
            Runtime.XDecref(etype);
            Runtime.XDecref(op);
        }

diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -1,4 +1,5 @@
using System;
using System.Runtime.InteropServices;

namespace Python.Runtime
@@ -222,22 +223,12 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)
            // Check these BEFORE the built-in import runs; may as well
            // do the Incref()ed return here, since we've already found
            // the module.
-            if (mod_name == "clr")
            {
-                IntPtr clr_module = GetCLRModule(fromList);
-                if (clr_module != IntPtr.Zero)
                {
-                    IntPtr sys_modules = Runtime.PyImport_GetModuleDict();
-                    if (sys_modules != IntPtr.Zero)
-                    {
-                        Runtime.PyDict_SetItemString(sys_modules, "clr", clr_module);
-                    }
                }
-                return clr_module;
-            }
-            if (mod_name == "CLR")
-            {
-                Exceptions.deprecation("The CLR module is deprecated. Please use 'clr'.");
                IntPtr clr_module = GetCLRModule(fromList);
                if (clr_module != IntPtr.Zero)
                {
@@ -249,8 +240,10 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)
                }
                return clr_module;
            }
            string realname = mod_name;
            string clr_prefix = null;
            if (mod_name.StartsWith("CLR."))
            {
                clr_prefix = "CLR."; // prepend when adding the module to sys.modules
@@ -312,11 +305,22 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)
            AssemblyManager.UpdatePath();
            if (!AssemblyManager.IsValidNamespace(realname))
            {
-                if (!AssemblyManager.LoadImplicit(realname))
                {
                    // May be called when a module being imported imports a module.
                    // In particular, I've seen decimal import copy import org.python.core
-                    return Runtime.PyObject_Call(py_import, args, kw);
                }
            }


diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -119,7 +119,7 @@ public ManagedType GetAttribute(string name, bool guess)
            // cost. Ask the AssemblyManager to do implicit loading for each
            // of the steps in the qualified name, then try it again.
            bool ignore = name.StartsWith("__");
-            if (AssemblyManager.LoadImplicit(qname, !ignore))
            {
                if (AssemblyManager.IsValidNamespace(qname))
                {
@@ -161,6 +161,11 @@ public ManagedType GetAttribute(string name, bool guess)
            return null;
        }


        /// <summary>
        /// Stores an attribute in the instance dict for future lookups.
@@ -365,7 +370,7 @@ internal void InitializePreload()
            if (interactive_preload)
            {
                interactive_preload = false;
-                if (Runtime.PySys_GetObject("ps1") != IntPtr.Zero)
                {
                    preload = true;
                }

diff --git a/src/runtime/pylist.cs b/src/runtime/pylist.cs
@@ -22,6 +22,11 @@ public PyList(IntPtr ptr) : base(ptr)
        {
        }


        /// <summary>
        /// PyList Constructor
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,6 +11,9 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].

		### Changed
		- Drop support for Python 2

		### Fixed

Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,11 @@ public PyList(IntPtr ptr) : base(ptr) @@
             {
             }
             /// <summary>
             /// PyList Constructor
@@ Expand Down @@