@@ -1,12 +1,9 @@
 """Module with our own gitdb implementation - it uses the git command"""
+from git.util import bin_to_hex, hex_to_bin
 from gitdb.base import (
     OInfo,
     OStream
 )
-from gitdb.util import (
-    bin_to_hex,
-    hex_to_bin
-)
 from gitdb.db import GitDB  # @UnusedImport
 from gitdb.db import LooseObjectDB
 
 
@@ -5,18 +5,17 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 import re
 
-from gitdb.util import hex_to_bin
+from git.cmd import handle_process_output
+from git.compat import (
+    defenc,
+    PY3
+)
+from git.util import finalize_process, hex_to_bin
 
 from .compat import binary_type
 from .objects.blob import Blob
 from .objects.util import mode_str_to_int
 
-from git.compat import (
-    defenc,
-    PY3
-)
-from git.cmd import handle_process_output
-from git.util import finalize_process
 
 __all__ = ('Diffable', 'DiffIndex', 'Diff', 'NULL_TREE')
 
 
@@ -39,11 +39,11 @@
     join_path_native,
     file_contents_ro,
     to_native_path_linux,
-    unbare_repo
+    unbare_repo,
+    to_bin_sha
 )
 from gitdb.base import IStream
 from gitdb.db import MemoryDB
-from gitdb.util import to_bin_sha
 
 import git.diff as diff
 import os.path as osp
 
@@ -3,14 +3,13 @@
 #
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
-from .util import get_object_type_by_name
-from git.util import LazyMixin, join_path_native, stream_copy
-from gitdb.util import (
-    bin_to_hex,
-    basename
-)
+from git.util import LazyMixin, join_path_native, stream_copy, bin_to_hex
 
 import gitdb.typ as dbtyp
+import os.path as osp
+
+from .util import get_object_type_by_name
+
 
 _assertion_msg_format = "Created object %r whose python type %r disagrees with the acutal git object type %r"
 
@@ -170,7 +169,7 @@ def _set_cache_(self, attr):
     @property
     def name(self):
         """:return: Name portion of the path, effectively being the basename"""
-        return basename(self.path)
+        return osp.basename(self.path)
 
     @property
     def abspath(self):
 
@@ -5,8 +5,8 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
 from gitdb import IStream
-from gitdb.util import hex_to_bin
 from git.util import (
+    hex_to_bin,
     Actor,
     Iterable,
     Stats,
 
@@ -5,12 +5,9 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 """ Module containing all object based types. """
 from . import base
-from .util import (
-    get_object_type_by_name,
-    parse_actor_and_date
-)
-from gitdb.util import hex_to_bin
-from git.compat import defenc
+from .util import get_object_type_by_name, parse_actor_and_date
+from ..util import hex_to_bin
+from ..compat import defenc
 
 __all__ = ("TagObject", )
 
 
@@ -5,7 +5,7 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 from git.util import join_path
 import git.diff as diff
-from gitdb.util import to_bin_sha
+from git.util import to_bin_sha
 
 from . import util
 from .base import IndexObject
@@ -18,7 +18,7 @@
     tree_to_stream
 )
 
-from gitdb.utils.compat import PY3
+from git.compat import PY3
 
 if PY3:
     cmp = lambda a, b: (a > b) - (a < b)
 
@@ -1,31 +1,29 @@
+import re
+import time
+
+from git.compat import (
+    PY3,
+    xrange,
+    string_types,
+    defenc
+)
+from git.objects.util import (
+    parse_date,
+    Serializable,
+    altz_to_utctz_str,
+)
 from git.util import (
     Actor,
     LockedFD,
     LockFile,
     assure_directory_exists,
     to_native_path,
-)
-
-from gitdb.util import (
     bin_to_hex,
-    join,
-    file_contents_ro_filepath,
+    file_contents_ro_filepath
 )
 
-from git.objects.util import (
-    parse_date,
-    Serializable,
-    altz_to_utctz_str,
-)
-from git.compat import (
-    PY3,
-    xrange,
-    string_types,
-    defenc
-)
+import os.path as osp
 
-import time
-import re
 
 __all__ = ["RefLog", "RefLogEntry"]
 
@@ -185,7 +183,7 @@ def path(cls, ref):
             instance would be found. The path is not guaranteed to point to a valid
             file though.
         :param ref: SymbolicReference instance"""
-        return join(ref.repo.git_dir, "logs", to_native_path(ref.path))
+        return osp.join(ref.repo.git_dir, "logs", to_native_path(ref.path))
 
     @classmethod
     def iter_entries(cls, stream):
 
@@ -1,9 +1,10 @@
+import os
+
 from git.util import join_path
-from gitdb.util import join
 
-from .head import Head
+import os.path as osp
 
-import os
+from .head import Head
 
 
 __all__ = ["RemoteReference"]
@@ -36,7 +37,7 @@ def delete(cls, repo, *refs, **kwargs):
         # and delete remainders manually
         for ref in refs:
             try:
-                os.remove(join(repo.git_dir, ref.path))
+                os.remove(osp.join(repo.git_dir, ref.path))
             except OSError:
                 pass
         # END for each ref
 
@@ -9,22 +9,14 @@
     join_path,
     join_path_native,
     to_native_path_linux,
-    assure_directory_exists
+    assure_directory_exists,
+    hex_to_bin,
+    LockedFD
 )
 from gitdb.exc import (
     BadObject,
     BadName
 )
-from gitdb.util import (
-    join,
-    dirname,
-    isdir,
-    exists,
-    isfile,
-    rename,
-    hex_to_bin,
-    LockedFD
-)
 
 import os.path as osp
 
@@ -83,7 +75,7 @@ def abspath(self):
 
     @classmethod
     def _get_packed_refs_path(cls, repo):
-        return join(repo.git_dir, 'packed-refs')
+        return osp.join(repo.git_dir, 'packed-refs')
 
     @classmethod
     def _iter_packed_refs(cls, repo):
@@ -136,7 +128,7 @@ def _get_ref_info(cls, repo, ref_path):
         point to, or None"""
         tokens = None
         try:
-            with open(join(repo.git_dir, ref_path), 'rt') as fp:
+            with open(osp.join(repo.git_dir, ref_path), 'rt') as fp:
                 value = fp.read().rstrip()
             # Don't only split on spaces, but on whitespace, which allows to parse lines like
             # 60b64ef992065e2600bfef6187a97f92398a9144                branch 'master' of git-server:/path/to/repo
@@ -420,8 +412,8 @@ def delete(cls, repo, path):
             or just "myreference", hence 'refs/' is implied.
             Alternatively the symbolic reference to be deleted"""
         full_ref_path = cls.to_full_path(path)
-        abs_path = join(repo.git_dir, full_ref_path)
-        if exists(abs_path):
+        abs_path = osp.join(repo.git_dir, full_ref_path)
+        if osp.exists(abs_path):
             os.remove(abs_path)
         else:
             # check packed refs
@@ -472,14 +464,14 @@ def _create(cls, repo, path, resolve, reference, force, logmsg=None):
         corresponding object and a detached symbolic reference will be created
         instead"""
         full_ref_path = cls.to_full_path(path)
-        abs_ref_path = join(repo.git_dir, full_ref_path)
+        abs_ref_path = osp.join(repo.git_dir, full_ref_path)
 
         # figure out target data
         target = reference
         if resolve:
             target = repo.rev_parse(str(reference))
 
-        if not force and isfile(abs_ref_path):
+        if not force and osp.isfile(abs_ref_path):
             target_data = str(target)
             if isinstance(target, SymbolicReference):
                 target_data = target.path
@@ -546,9 +538,9 @@ def rename(self, new_path, force=False):
         if self.path == new_path:
             return self
 
-        new_abs_path = join(self.repo.git_dir, new_path)
-        cur_abs_path = join(self.repo.git_dir, self.path)
-        if isfile(new_abs_path):
+        new_abs_path = osp.join(self.repo.git_dir, new_path)
+        cur_abs_path = osp.join(self.repo.git_dir, self.path)
+        if osp.isfile(new_abs_path):
             if not force:
                 # if they point to the same file, its not an error
                 with open(new_abs_path, 'rb') as fd1:
@@ -563,12 +555,12 @@ def rename(self, new_path, force=False):
             os.remove(new_abs_path)
         # END handle existing target file
 
-        dname = dirname(new_abs_path)
-        if not isdir(dname):
+        dname = osp.dirname(new_abs_path)
+        if not osp.isdir(dname):
             os.makedirs(dname)
         # END create directory
 
-        rename(cur_abs_path, new_abs_path)
+        os.rename(cur_abs_path, new_abs_path)
         self.path = new_path
 
         return self