diff --git a/.htaccess b/.htaccess
index 1812482675..34c8a23451 100644
--- a/.htaccess
+++ b/.htaccess
@@ -2,6 +2,7 @@ ErrorDocument 404 //owncloud/core/templates/404.php
 <IfModule mod_php5.c>
 	php_value upload_max_filesize 512M
 	php_value post_max_size 512M
+  php_value memory_limit 128M
 	SetEnv htaccessWorking true
 </IfModule>
 Options -Indexes
diff --git a/apps/gallery/ajax/thumbnail.php b/apps/gallery/ajax/thumbnail.php
index c8b9ee3ef3..b3501ab4af 100644
--- a/apps/gallery/ajax/thumbnail.php
+++ b/apps/gallery/ajax/thumbnail.php
@@ -49,7 +49,6 @@ $box_size = 200;
 $img = $_GET['img'];
 
 $tmp = OC::$CONFIG_DATADIRECTORY . $img;
-$imagesize = getimagesize($tmp);
 
 header('Content-Type: image/png');
 $image = CroppedThumbnail($tmp, $box_size, $box_size);
diff --git a/apps/gallery/lib_scanner.php b/apps/gallery/lib_scanner.php
index 8f7c49b671..5d88a08158 100644
--- a/apps/gallery/lib_scanner.php
+++ b/apps/gallery/lib_scanner.php
@@ -39,8 +39,6 @@ class OC_GALLERY_SCANNER {
     $albumId = $result->fetchRow();
     $albumId = $albumId['album_id'];
     foreach ($current_album['images'] as $img) {
-      error_log($img);
-      error_log($albumId);
       $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_photos WHERE "album_id" = ? AND "file_path" = ?');
       $result = $stmt->execute(array($albumId, $img));
       if ($result->numRows() == 0) {
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index fc92479e3b..9786990755 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -5,7 +5,7 @@ OC_Util::addScript('gallery', 'album_cover');
 ?>
 
 <div id="controls">
-  <input type="button" value="New album" onclick="javascript:createNewAlbum();" />
+  <!--  <input type="button" value="New album" onclick="javascript:createNewAlbum();" />-->
   <input type="button" value="Rescan" onclick="javascript:scanForAlbums();" /><br/>
 </div>
 <div id="gallery_list">