Index: kernel/classes/binaryhandlers/ezfilepassthrough/ezfilepassthroughhandler.php
===================================================================
--- kernel/classes/binaryhandlers/ezfilepassthrough/ezfilepassthroughhandler.php	(revision 22373)
+++ kernel/classes/binaryhandlers/ezfilepassthrough/ezfilepassthroughhandler.php	(working copy)
@@ -51,7 +51,6 @@
     {
         $fileName = $fileInfo['filepath'];
 
-        // VS-DBFILE
         $file = eZClusterFileHandler::instance( $fileName );
 
         if ( $fileName != "" and $file->exists() )
Index: kernel/classes/datatypes/ezbinaryfile/ezbinaryfile.php
===================================================================
--- kernel/classes/datatypes/ezbinaryfile/ezbinaryfile.php	(revision 22373)
+++ kernel/classes/datatypes/ezbinaryfile/ezbinaryfile.php	(working copy)
@@ -92,7 +92,6 @@
     {
         $fileInfo = $this->storedFileInfo();
 
-        // VS-DBFILE
         $file = eZClusterFileHandler::instance( $fileInfo['filepath'] );
         if ( $file->exists() )
         {
@@ -223,7 +222,6 @@
                 $parserObject = new $class( );
                 $fileInfo = $this->storedFileInfo();
 
-                // VS-DBFILE
                 $file = eZClusterFileHandler::instance( $fileInfo['filepath'] );
                 if ( $file->exists() )
                 {
Index: kernel/classes/datatypes/ezbinaryfile/ezbinaryfiletype.php
===================================================================
--- kernel/classes/datatypes/ezbinaryfile/ezbinaryfiletype.php	(revision 22373)
+++ kernel/classes/datatypes/ezbinaryfile/ezbinaryfiletype.php	(working copy)
@@ -310,7 +310,6 @@
 
             $binary->store();
 
-            // VS-DBFILE
             $filePath = $binaryFile->attribute( 'filename' );
             $fileHandler = eZClusterFileHandler::instance();
             $fileHandler->fileStore( $filePath, 'binaryfile', true, $mime );
@@ -396,7 +395,6 @@
 
         $binary->store();
 
-        // SP-DBFILE
         $filePath = $httpFile->attribute( 'filename' );
         $fileHandler = eZClusterFileHandler::instance();
         $fileHandler->fileStore( $filePath, 'binaryfile', true, $mimeData['name'] );
@@ -453,7 +451,6 @@
 
         copy( $filePath, $destination );
 
-        // SP-DBFILE
         $fileHandler = eZClusterFileHandler::instance();
         $fileHandler->fileStore( $destination, 'binaryfile', true, $mimeData['name'] );
 
@@ -727,7 +724,6 @@
 
         $binaryFile->store();
 
-        // VS-DBFILE + SP DBFile fix
         $fileHandler = eZClusterFileHandler::instance();
         $fileHandler->fileStore( $destinationPath . $basename, 'binaryfile', true );
     }
Index: kernel/classes/datatypes/ezimage/ezimagealiashandler.php
===================================================================
--- kernel/classes/datatypes/ezimage/ezimagealiashandler.php	(revision 22373)
+++ kernel/classes/datatypes/ezimage/ezimagealiashandler.php	(working copy)
@@ -433,8 +433,6 @@
                 if ( $imageManager->createImageAlias( $aliasName, $aliasList,
                                                       array( 'basename' => $basename ) ) )
                 {
-                    // VS-DBFILE : TODO checked..
-
                     $text = $this->displayText( $original['alternative_text'] );
                     $originalFilename = $original['original_filename'];
                     foreach ( $aliasList as $aliasKey => $alias )
@@ -449,7 +447,6 @@
                         }
                         if ( $alias['is_new'] )
                         {
-                            // VS-DBFILE : TODO checked
                             eZImageFile::appendFilepath( $this->ContentObjectAttributeData['id'], $alias['url'] );
                         }
                         $aliasList[$aliasKey] = $alias;
@@ -596,7 +593,6 @@
         $aliasEntry['is_new'] = false;
         $aliasEntry['filesize'] = false;
 
-        // VS-DBFILE
         if ( $aliasEntry['url'] )
         {
             $aliasFile = eZClusterFileHandler::instance( $aliasEntry['url'] );
@@ -647,8 +643,6 @@
 
                 if ( $aliasEntry['url'] )
                 {
-                    // VS-DBFILE
-
                     $aliasFile = eZClusterFileHandler::instance( $aliasEntry['url'] );
 
                     if ( $aliasFile->exists() )
@@ -676,8 +670,6 @@
     */
     static function removeAllAliases( $contentObjectAttribute )
     {
-        // VS-DBFILE
-
         $handler = $contentObjectAttribute->attribute( 'content' );
         if ( !$handler->isImageOwner() )
         {
@@ -733,8 +725,6 @@
                 $alternativeText = $alias['alternative_text'];
             if ( $alias['is_valid'] )
             {
-                // VS-DBFILE
-
                 $filepath = $alias['url'];
 
                 // Fetch ezimage attributes that have $filepath.
@@ -831,8 +821,6 @@
                         continue;
                     }
 
-                    // VS-DBFILE
-
                     $fileHandler = eZClusterFileHandler::instance();
                     $fileHandler->fileMove( $oldURL, $alias['url'] );
 
@@ -841,8 +829,6 @@
                 }
                 else
                 {
-                    // VS-DBFILE
-
                     $fileHandler = eZClusterFileHandler::instance();
                     $fileHandler->fileLinkCopy( $oldURL, $alias['url'], false );
                     eZImageFile::appendFilepath( $this->ContentObjectAttributeData['id'], $alias['url'] );
@@ -909,8 +895,6 @@
         $filename = $aliasList[$aliasName]['url'];
         if ( $filename )
         {
-            // VS-DBFILE
-
             $imageFile = eZClusterFileHandler::instance( $filename );
 
             $fetchedFilePath = $imageFile->fetchUnique();
@@ -1183,8 +1167,6 @@
         $aliasList['original']['alternative_text'] = $imageAltText;
         $aliasList['original']['original_filename'] = $originalFilename;
 
-        // VS-DBFILE
-
         $fileHandler = eZClusterFileHandler::instance();
         $filePath = $mimeData['url'];
         $fileHandler->fileStore( $filePath, 'image', false, $mimeData['name'] );
@@ -1203,8 +1185,6 @@
                 $aliasList['original']['filesize'] = $aliasFile->size();
         }
 
-        // VS-DBFILE
-
         // refetch the original image
         $fileHandler->fileFetch( $filePath );
 
@@ -1251,7 +1231,6 @@
 
         eZImageFile::appendFilepath( $this->ContentObjectAttributeData['id'], $mimeData['url'] );
 
-        // VS-DBFILE
         $fileHandler->fileDeleteLocal( $filePath );
 
         return true;
Index: kernel/classes/datatypes/ezmedia/ezmedia.php
===================================================================
--- kernel/classes/datatypes/ezmedia/ezmedia.php	(revision 22373)
+++ kernel/classes/datatypes/ezmedia/ezmedia.php	(working copy)
@@ -120,7 +120,6 @@
     {
         $fileInfo = $this->storedFileInfo();
 
-        // VS-DBFILE
         $file = eZClusterFileHandler::instance( $fileInfo['filepath'] );
 
         if ( $file->exists() )
Index: kernel/classes/datatypes/ezmedia/ezmediatype.php
===================================================================
--- kernel/classes/datatypes/ezmedia/ezmediatype.php	(revision 22373)
+++ kernel/classes/datatypes/ezmedia/ezmediatype.php	(working copy)
@@ -111,8 +111,6 @@
                 if ( $fileName == '' )
                     continue;
 
-                // VS-DBFILE
-
                 $file = eZClusterFileHandler::instance( $orig_dir . "/" . $fileName );
                 if ( $file->exists() )
                     $file->delete();
@@ -137,8 +135,6 @@
                 }
                 if ( $count == 1 && $currentFileName != '' )
                 {
-                    // VS-DBFILE
-
                     $file = eZClusterFileHandler::instance( $orig_dir . "/" . $currentFileName );
                     if ( $file->exists() )
                         $file->delete();
@@ -321,8 +317,6 @@
             $media->setAttribute( "original_filename", $mediaFile->attribute( "original_filename" ) );
             $media->setAttribute( "mime_type", $mime );
 
-            // VS-DBFILE
-
             //$filePath = $media->attribute( 'original_filename' );
             $filePath = $mediaFile->attribute( 'filename' );
             $fileHandler = eZClusterFileHandler::instance();
@@ -426,8 +420,6 @@
         $media->setAttribute( "has_controller", $hasController );
         $media->setAttribute( "is_loop", $isLoop );
 
-        // SP-DBFILE
-
         $filePath = $httpFile->attribute( 'filename' );
         $fileHandler = eZClusterFileHandler::instance();
         $fileHandler->fileStore( $filePath, 'mediafile', true, $mimeData['name'] );
@@ -483,7 +475,6 @@
 
         copy( $filePath, $destination );
 
-        // SP-DBFILE
         $fileHandler = eZClusterFileHandler::instance();
         $fileHandler->fileStore( $destination, 'mediafile', true, $mimeData['name'] );
 
@@ -802,8 +793,6 @@
         $mediaFile->setAttribute( 'quality', $mediaNode->getAttribute( 'quality' ) );
         $mediaFile->setAttribute( 'is_loop', $mediaNode->getAttribute( 'is-loop' ) );
 
-        // VS-DBFILE
-
         $fileHandler = eZClusterFileHandler::instance();
         $fileHandler->fileStore( $destinationPath . $basename, 'mediafile', true );
 
Index: kernel/classes/ezcache.php
===================================================================
--- kernel/classes/ezcache.php	(revision 22373)
+++ kernel/classes/ezcache.php	(working copy)
@@ -464,8 +464,6 @@
     {
         $cachePath = eZSys::cacheDirectory();
 
-        // VS-DBFILE
-
         $fileHandler = eZClusterFileHandler::instance();
         $fileHandler->fileDelete( $cachePath, 'classidentifiers_' );
         $fileHandler->fileDelete( $cachePath, 'classattributeidentifiers_' );
@@ -480,8 +478,6 @@
     {
         $cachePath = eZSys::cacheDirectory();
 
-        // VS-DBFILE
-
         $fileHandler = eZClusterFileHandler::instance();
         $fileHandler->fileDelete( $cachePath, 'sortkey_' );
     }
Index: kernel/classes/ezcontentcache.php
===================================================================
--- kernel/classes/ezcontentcache.php	(revision 22373)
+++ kernel/classes/ezcontentcache.php	(working copy)
@@ -86,8 +86,6 @@
     {
         $cachePathInfo = eZContentCache::cachePathInfo( $siteDesign, $nodeID, $viewMode, $language, $offset, $roleList, $discountList,
                                                         $layout, false, $parameters );
-        // VS-DBFILE
-
         $cacheFile = eZClusterFileHandler::instance( $cachePathInfo['path'] );
 
         if ( $cacheFile->exists() )
@@ -124,8 +122,6 @@
         $cachePath = $cachePathInfo['path'];
         $timestamp = false;
 
-        // VS-DBFILE
-
         $cacheFile = eZClusterFileHandler::instance( $cachePath );
 
         if ( $cacheFile->exists() )
@@ -155,8 +151,6 @@
 
         $fileName = $cacheDir . "/" . $cacheFile;
 
-        // VS-DBFILE : FIXME: We may need to cache PDF files locally.
-
         $cacheFile = eZClusterFileHandler::instance( $fileName );
         $contents = $cacheFile->fetchContents();
 
@@ -272,10 +266,6 @@
         $path = $cacheDir . '/' . $cacheFile;
         $uniqid = md5( uniqid( 'ezpcache'. getmypid(), true ) );
 
-        // VS-DBFILE : FIXME: Use some kind of one-shot atomic storing here.
-        //             FIXME: use permissions provided in FileSettings:StorageFilePermissions.
-
-
         $file = eZClusterFileHandler::instance( "$cacheDir/$uniqid" );
         $file->storeContents( $serializeString, 'viewcache', 'pdf' );
         $file->move( $path );
Index: kernel/classes/ezcontentobjecttreenode.php
===================================================================
--- kernel/classes/ezcontentobjecttreenode.php	(revision 22382)
+++ kernel/classes/ezcontentobjecttreenode.php	(working copy)
@@ -326,8 +326,6 @@
         $db = eZDB::instance();
         $dbName = $db->DB;
 
-        // VS-DBFILE
-
         //include_once( 'lib/ezutils/classes/ezphpcreator.php' );
         $cacheDir = eZSys::cacheDirectory();
         $phpCache = new eZPHPCreator( $cacheDir,
Index: kernel/classes/eznodeviewfunctions.php
===================================================================
--- kernel/classes/eznodeviewfunctions.php	(revision 22373)
+++ kernel/classes/eznodeviewfunctions.php	(working copy)
@@ -213,37 +213,8 @@
             $cacheTTL = -1;
         }
 
-/*
-// This checking is now handled outside of this function.
-        // Check if cache time = 0 (disabled)
-        if ( $cacheTTL == 0 )
-        {
-            $viewCacheEnabled = false;
-        }
-*/
-
         $Result['cache_ttl'] = $cacheTTL;
 
-/*
-// File storage is now handled outside of this function
-        // Store view cache
-        if ( $viewCacheEnabled )
-        {
-            $serializeString = serialize( $Result );
-
-            //include_once( "lib/ezfile/classes/ezatomicfile.php" );
-            $cacheFile = new eZAtomicFile( $cachePath );
-            $cacheFile->write( $serializeString );
-            $cacheFile->close();
-
-            // VS-DBFILE
-
-            require_once( 'kernel/classes/ezclusterfilehandler.php' );
-            $fileHandler = eZClusterFileHandler::instance();
-            $fileHandler->fileStore( $cachePath, 'viewcache', true );
-        }
-*/
-
         if ( $languageCode )
         {
             $node->setCurrentLanguage( $oldLanguageCode );
Index: kernel/classes/ezurlwildcard.php
===================================================================
--- kernel/classes/ezurlwildcard.php	(revision 22376)
+++ kernel/classes/ezurlwildcard.php	(working copy)
@@ -491,7 +491,6 @@
             eZDir::mkdir( $wildcardCacheDir, eZDir::directoryPermission(), true );
         }
 
-        // VS-DBFILE
         $phpCacheIndex = new eZPHPCreator( $wildcardCacheDir, $wildcardCacheFile . "_index.php", '', array( 'clustering' => 'wildcard-cache-index' ) );
 
         foreach ( $wildcardKeys as $wildcardKey => $wildcardKeyValue )
@@ -517,7 +516,6 @@
                 break;
             }
 
-            // VS-DBFILE
             $phpCache = new eZPHPCreator( $wildcardCacheDir, $wildcardCacheFile . "_$cacheFilesCount.php", '', array( 'clustering' => 'wildcard-cache-' . $cacheFilesCount ) );
 
             foreach ( $wildcardKeys as $wildcardKey => $wildcardKeyValue )
@@ -661,8 +659,6 @@
     {
         $info = eZURLWildcard::cacheInfo();
 
-        // VS-DBFILE
-
         $cacheFile = eZClusterFileHandler::instance( $info['path'] . "_index.php" );
 
         return $cacheFile;
@@ -676,15 +672,11 @@
     {
         $info = eZURLWildcard::cacheInfo();
 
-        // VS-DBFILE
-
         $cacheFile = eZClusterFileHandler::instance( $info['path'] . "_index.php" );
 
         if ( !$cacheFile->exists() )
             return false;
 
-        // VS-DBFILE
-
         $fetchedFilePath = $cacheFile->fetchUnique();
         include_once( $fetchedFilePath );
         $cacheFile->fileDeleteLocal( $fetchedFilePath );
@@ -712,7 +704,6 @@
     $info = eZURLWildcard::cacheInfo();
     $cacheFileName = $info['path'] . "_$cacheFileNum" . ".php";
 
-    // VS-DBFILE
     $cacheFile = eZClusterFileHandler::instance( $cacheFileName );
 
     if ( !$cacheFile->exists() )
@@ -721,8 +712,6 @@
         return false;
     }
 
-    // VS-DBFILE
-
     $fetchedFilePath = $cacheFile->fetchUnique();
     include_once( $fetchedFilePath );
     $cacheFile->fileDeleteLocal( $fetchedFilePath );
Index: kernel/rss/edit_functions.php
===================================================================
--- kernel/rss/edit_functions.php	(revision 22373)
+++ kernel/rss/edit_functions.php	(working copy)
@@ -53,7 +53,6 @@
             $validationErrors[] =ezi18n( 'design/admin/rss/edit_export',
                                          'If RSS Export is Active then a valid Access URL is required.'  );
         }*/
-        // VS-DBFILE
 
         /* Kill the RSS cache in all siteaccesses */
         $config = eZINI::instance( 'site.ini' );
@@ -66,7 +65,6 @@
             $cacheFile = eZClusterFileHandler::instance( $cacheFilePath );
             if ( $cacheFile->exists() )
             {
-                // VS-DBFILE : FIXME: optimize not to use recursive delete.
                 $cacheFile->delete();
             }
         }
Index: kernel/rss/feed.php
===================================================================
--- kernel/rss/feed.php	(revision 22373)
+++ kernel/rss/feed.php	(working copy)
@@ -75,8 +75,6 @@
         chmod( $cacheDir.'/rss', octdec( $mode ) );
     }
 
-    // VS-DBFILE
-
     $cacheFile = eZClusterFileHandler::instance( $cacheFilePath );
 
     if ( !$cacheFile->exists() or ( time() - $cacheFile->mtime() > $cacheTime ) )
Index: lib/ezfile/classes/ezfilehandler.php
===================================================================
--- lib/ezfile/classes/ezfilehandler.php	(revision 22373)
+++ lib/ezfile/classes/ezfilehandler.php	(working copy)
@@ -314,8 +314,6 @@
     */
     static function move( $sourceFilename, $destinationFilename )
     {
-        // VS-DBFILE : TODO
-
         if ( !file_exists( $sourceFilename ) and
              !is_link( $sourceFilename ) )
         {
@@ -338,7 +336,6 @@
                 $destinationFilename .= '/' . substr( $sourceFilename, $filePosition );
         }
 
-
         // If source and destination are the same files we just return true
         if ( $sourceFilename == $destinationFilename )
         {
Index: lib/ezimage/classes/ezimagemanager.php
===================================================================
--- lib/ezimage/classes/ezimagemanager.php	(revision 22373)
+++ lib/ezimage/classes/ezimagemanager.php	(working copy)
@@ -851,8 +851,6 @@
         //eZDebug::writeDebug( 'alias ' . $referenceAlias, 'eZImageManager::createImageAlias' );
         if ( array_key_exists( $referenceAlias, $existingAliasList ) )
         {
-            // VS-DBFILE
-
             $fileHandler = eZClusterFileHandler::instance();
             if ( $fileHandler->fileExists( $existingAliasList[$referenceAlias]['url'] ) )
             {
@@ -888,8 +886,6 @@
             $aliasFilePath = $aliasInfo['url'];
             $aliasKey = $currentAliasInfo['alias_key'];
 
-            // VS-DBFILE
-
             $aliasFile = eZClusterFileHandler::instance( $aliasFilePath );
 
             if ( $aliasFile->exists() )
@@ -929,7 +925,6 @@
                         $destinationDir = $destinationMimeData['dirpath'];
                         eZDebug::writeError( "Failed converting $sourceFile to alias '$aliasName' in directory '$destinationDir'",
                                              'eZImageManager::createImageAlias' );
-                        // VS-DBFILE
                         $aliasFile->deleteLocal();
                         return false;
                     }
@@ -959,8 +954,6 @@
                 $currentAliasData['full_path'] =& $currentAliasData['url'];
                 if ( function_exists( 'getimagesize' ) )
                 {
-                    // VS-DBFILE
-
                     $fileHandler = eZClusterFileHandler::instance();
                     $fileHandler->fileFetch( $destinationMimeData['url'] );
 
@@ -979,8 +972,6 @@
                             eZDebug::writeError("The size of the generated image " . $destinationMimeData['url'] . " could not be read by getimagesize()", 'eZImageManager::createImageAlias' );
                         }
 
-                        // VS-DBFILE
-
                         // The file is not written to the database if it was already written due to a lock situation
                         if ( !isset( $wasLocked ) )
                         {
@@ -996,7 +987,6 @@
                 else
                     eZDebug::writeError( "Unknown function 'getimagesize' cannot get image size", 'eZImageManager::createImageAlias' );
                 $existingAliasList[$aliasName] = $currentAliasData;
-                // VS-DBFILE
                 $aliasFile->deleteLocal();
 
                 $this->_freeExclusiveLock( $aliasFilePath, $aliasName );
@@ -1042,8 +1032,6 @@
     */
     function convert( $sourceMimeData, &$destinationMimeData, $aliasName = false, $parameters = array() )
     {
-        // VS-DBFILE
-
         $sourceFile = eZClusterFileHandler::instance( $sourceMimeData['url'] );
         $sourceFile->fetch();
 
@@ -1137,7 +1125,6 @@
                 }
                 if ( !$hasDestination )
                 {
-                    // VS-DBFILE
                     $sourceFile->deleteLocal();
                     return false;
                 }
@@ -1187,7 +1174,6 @@
                 {
                     eZDebug::writeError( "None of the handlers can convert MIME-Type " . $currentMimeData['name'],
                                          'eZImageManager::convert' );
-                    // VS-DBFILE
                     $sourceFile->deleteLocal();
                     return false;
                 }
@@ -1288,8 +1274,6 @@
         }
         $destinationMimeData = $currentMimeData;
 
-        // VS-DBFILE
-
         if ( $aliasName && $aliasName != 'original' )
         {
             if ( $result )
Index: lib/ezpdf/classes/ezpdf.php
===================================================================
--- lib/ezpdf/classes/ezpdf.php	(revision 22373)
+++ lib/ezpdf/classes/ezpdf.php	(working copy)
@@ -305,8 +305,6 @@
 
                 eZDir::mkdir( eZDir::dirpath( $filename ), false, true );
 
-                // VS-DBFILE
-
                 $file = eZClusterFileHandler::instance( $filename );
                 $file->storeContents( $this->PDF->ezOutput(), 'viewcache', 'pdf' );
 
Index: lib/ezutils/classes/ezhttpfile.php
===================================================================
--- lib/ezutils/classes/ezhttpfile.php	(revision 22373)
+++ lib/ezutils/classes/ezhttpfile.php	(working copy)
@@ -104,8 +104,6 @@
         if ( $mimeData )
             $dir = $mimeData['dirpath'];
 
-        // VS-DBFILE : TODO
-
         if ( !$mimeData )
         {
             $dir .= $this->MimeCategory;
@@ -132,8 +130,6 @@
             $dest_name = $dir . "/" . md5( basename( $this->Filename ) . microtime() . mt_rand() ) . $suffixString;
         }
 
-        // VS-DBFILE : TODO
-
         if ( !move_uploaded_file( $this->Filename, $dest_name ) )
         {
             eZDebug::writeError( "Failed moving uploaded file " . $this->Filename . " to destination $dest_name" );