diff --git a/.pylintrc b/.pylintrc
index a0cbca96..54ddaaf0 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -11,7 +11,6 @@ extension-pkg-whitelist=lxml.etree
 #  - consider-using-dict-comprehension
 #  - not-an-iterable
 disable=
-  bad-continuation,
   raising-format-tuple,
   raise-missing-from,
   import-outside-toplevel,
@@ -19,7 +18,6 @@ disable=
   duplicate-code,
   fixme,
   locally-disabled,
-  locally-enabled,
   useless-object-inheritance,
   consider-using-set-comprehension,
   consider-using-dict-comprehension,
diff --git a/qubesadmin/vm/__init__.py b/qubesadmin/vm/__init__.py
index 4ed8dbe5..1c5be634 100644
--- a/qubesadmin/vm/__init__.py
+++ b/qubesadmin/vm/__init__.py
@@ -34,11 +34,6 @@
 import qubesadmin.firewall
 import qubesadmin.tags
 
-if not hasattr(shlex, 'quote'):
-    # python2 compat
-    import pipes
-    shlex.quote = pipes.quote
-
 class QubesVM(qubesadmin.base.PropertyHolder):
     '''Qubes domain.'''