diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
index 2cebad4bd..3fceb443a 100644
--- a/src/Composer/Autoload/AutoloadGenerator.php
+++ b/src/Composer/Autoload/AutoloadGenerator.php
@@ -621,13 +621,7 @@ FOOTER;
                             $path = $package->getTargetDir() . '/' . $path;
                         }
                     }
-                    
-                    /* RKERNER
-                     * // add target-dir to classmap entries that don't have it
-                    if ($type === 'classmap' && $package !== $mainPackage && $package->getTargetDir() && !is_readable($installPath.'/'.$path)) {
-                        $path = $package->getTargetDir() . '/' . $path;
-                    }
-*/
+
                     if ($type === 'exclude-from-classmap') {
                         // first escape user input
                         $path = sprintf(self::EXCLUDE_PATTERN, preg_quote($path));
@@ -644,13 +638,6 @@ FOOTER;
                         $autoloads[] = empty($installPath) ? $path : preg_quote($installPath) . '/' . $path;
                         continue;
                     }
-/*
-                    if (empty($installPath)) {
-                        $autoloads[$namespace][] = empty($path) ? '.' : $path;
-                    } else {
-                        $autoloads[$namespace][] = $installPath.'/'.$path;
-                    }
-                     */
 
                     $relativePath = empty($installPath) ? (empty($path) ? '.' : $path) : $installPath.'/'.$path;
 
diff --git a/src/Composer/Autoload/ClassMapGenerator.php b/src/Composer/Autoload/ClassMapGenerator.php
index 1f0e1ceed..cbbd8e1dd 100644
--- a/src/Composer/Autoload/ClassMapGenerator.php
+++ b/src/Composer/Autoload/ClassMapGenerator.php
@@ -54,7 +54,6 @@ class ClassMapGenerator
      * @throws \RuntimeException When the path is neither an existing file nor directory
      */
     public static function createMap($path, $blacklist = '', IOInterface $io = null, $namespace = null)
-    // RKERNER: public static function createMap($path, $blacklist = '')
     {
         if (is_string($path)) {
             if (is_file($path)) {