diff --git a/admin/feeds.php b/admin/feeds.php
index f330afc..2238212 100644
--- a/admin/feeds.php
+++ b/admin/feeds.php
@@ -86,7 +86,6 @@ if ($user->isAdmin()) {
 								<label for="source"><?php echo __("Import data from:")?></label>
 								<select name="source" id="source" onchange="selectFeedType('<?php echo __("Feed Url:")?>','<?php echo __(" username:")?>' )">
                                 	<option value="Rss" selected="selected">Rss/atom Feed</option>
-                                 	<option value="Flickr">Flickr</option>
                                     <option value="Twitter">Twitter</option>
                                     <option value="Youtube">Youtube</option>
                                     <option value="Last.fm">Last.fm</option>
diff --git a/classes/feeds.class.php b/classes/feeds.class.php
index 5013cdf..428cdf0 100644
--- a/classes/feeds.class.php
+++ b/classes/feeds.class.php
@@ -38,8 +38,7 @@ class feeds extends Conexion_Mysql {
 			case 'VOX': 	$f['url'] = 'http://{{username}}.vox.com/library/posts/atom.xml'; $f['type'] = 1; break;
 			case 'Digg': 	$f['url'] = 'http://digg.com/rss/{{username}}/index2.xml'; $f['type'] = 1; break;
 			case 'Tumblr': 	$f['url'] = 'http://{{username}}.tumblr.com/rss'; $f['type'] = 1; break;
-/*>>*/		case 'Flickr': 	$f['url'] = 'http:/flickr.com/photos/{{username}}'; $f['type'] = 2; break; 
-/*>>*/		case 'Twitter': $f['url'] = 'http://twitter.com/{{username}}'; $f['type'] = 1; break;
+			case 'Twitter': $f['url'] = 'http://twitter.com/{{username}}'; $f['type'] = 1; break;
 			case 'Last.fm': $f['url'] = 'http://ws.audioscrobbler.com/1.0/user/{{username}}/recenttracks.rss'; $f['type'] = 1; break;
 			case 'Blogger': $f['url'] = 'http://{{username}}.blogspot.com/feeds/posts/default'; $f['type'] = 1; break;
 			case 'Youtube': $f['url'] = 'http://www.youtube.com/rss/user/{{username}}/videos.rss'; $f['type'] = 1; break;