3 files changed, 2 insertions, 44 deletions
diff --git a/views/default/forms/photos/admin/settings.php b/views/default/forms/photos/admin/settings.php
index 403203f69..e0b8a9880 100644
--- a/views/default/forms/photos/admin/settings.php
+++ b/views/default/forms/photos/admin/settings.php
@@ -5,7 +5,7 @@
  * @todo remove original image, group only upload not delete
  */
 
-$plugin = elgg_get_plugin_from_id('tidypics');
+$plugin = elgg_get_plugin_from_id('lightpics');
 
 $title = elgg_echo('tidypics:settings:main');
 $content = elgg_view('forms/photos/admin/settings/main', array('plugin' => $plugin));
diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php
index f7950a7ad..a35c9ab59 100644
--- a/views/default/forms/photos/admin/settings/main.php
+++ b/views/default/forms/photos/admin/settings/main.php
@@ -5,10 +5,9 @@
 
 $plugin = $vars['plugin'];
 
-$checkboxes = array('tagging', 'view_count', 'exif', 'download_link');
+$checkboxes = array('view_count', 'exif', 'download_link');
 foreach ($checkboxes as $checkbox) {
 	echo '<div>';
-	$checked = $plugin->$checkbox ? 'checked' : false;
 	echo elgg_view('input/checkbox', array(
 		'name' => "params[$checkbox]",
 		'value' => true,
@@ -27,14 +26,6 @@ echo elgg_view('input/text', array(
 ));
 echo '</div>';
 
-// Watermark Text
-echo '<div>' . elgg_echo('tidypics:settings:watermark');
-echo elgg_view("input/text", array(
-	'name' => 'params[watermark_text]',
-	'value' => $plugin->watermark_text,
-));
-echo '</div>';
-
 // Quota Size
 $quota = $plugin->quota;
 if (!$quota) {
diff --git a/views/default/forms/photos/image/tag.php b/views/default/forms/photos/image/tag.php
deleted file mode 100644
index 31869be9e..000000000
--- a/views/default/forms/photos/image/tag.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Tag select form body
- *
- * @uses $vars['entity']
- *
- * @author Cash Costello
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
- */
-
-echo '<div class="elgg-col elgg-col-4of5">';
-
-echo elgg_view('input/autocomplete', array(
-	'name' => 'username',
-	'match_on' => 'friends',
-));
-
-echo elgg_view('input/hidden', array(
-	'name' => 'guid',
-	'value' => $vars['entity']->getGUID(),
-));
-
-echo elgg_view('input/hidden', array(
-	'name' => 'coordinates',
-));
-
-echo '</div>';
-
-echo '<div class="elgg-col elgg-col-1of5 center">';
-echo elgg_view('input/submit', array(
-	'value' => elgg_echo('tidypics:actiontag'),
-));
-echo '</div>';