diff --git a/block/flickr_block.module b/block/flickr_block.module
index 074db90..edc2e7a 100644
--- a/block/flickr_block.module
+++ b/block/flickr_block.module
@@ -359,7 +359,6 @@ function flickr_block_save($delta = '', $edit = array()) {
  * Implements hook_block_view().
  */
 function flickr_block_view($delta = '') {
-  drupal_add_css(drupal_get_path('module', 'flickr') . '/flickr.css');
   $settings = variable_get('flickr_block_' . $delta, array(
     'user_id' => '',
     'show_n' => 4,
diff --git a/field/flickrfield.module b/field/flickrfield.module
index e1a098d..43ceae3 100644
--- a/field/flickrfield.module
+++ b/field/flickrfield.module
@@ -19,13 +19,6 @@ function flickrfield_help($path, $arg) {
 }
 
 /**
- * Include css unconditionally.
- */
-function flickrfield_init() {
-  drupal_add_css(drupal_get_path('module', 'flickr') . '/flickr.css');
-}
-
-/**
  * Implements hook_field_info().
  */
 function flickrfield_field_info() {
diff --git a/sets/flickr_sets.module b/sets/flickr_sets.module
index 2433a6a..32478c0 100644
--- a/sets/flickr_sets.module
+++ b/sets/flickr_sets.module
@@ -63,9 +63,6 @@ function flickr_sets_photosets($account, $nsid = NULL) {
   global $pager_page_array, $pager_total, $pager_total_items, $user;
 
   drupal_set_title(flickr_sets_page_title($user));
-  if (variable_get('flickr_css', 1)) {
-    drupal_add_css(drupal_get_path('module', 'flickr') . '/flickr.css');
-  }
   $uid = $account->uid;
   $nsid = $account->flickr['nsid'];
   // Set this to something else if you want multiple pagers.
@@ -102,9 +99,6 @@ function flickr_sets_photosets($account, $nsid = NULL) {
 function flickr_sets_photoset($account, $set) {
   global $pager_page_array, $pager_total, $pager_total_items, $user;
 
-  if (variable_get('flickr_css', 1)) {
-    drupal_add_css(drupal_get_path('module', 'flickr') . '/flickr.css');
-  }
   $uid = $user->uid;
   $nsid = $account->flickr['nsid'];
 
diff --git a/tags/flickr_tags.module b/tags/flickr_tags.module
index 505d9dc..3f4f3ec 100644
--- a/tags/flickr_tags.module
+++ b/tags/flickr_tags.module
@@ -54,7 +54,9 @@ function flickr_tags_menu() {
  * Returns a given user's tags cloud.
  */
 function flickr_tags_cloud($account, $nsid = NULL) {
-  drupal_add_css(drupal_get_path('module', 'flickr_tags') . '/flickr_tags.css');
+  if (variable_get('flickr_css', 1)) {
+    drupal_add_css(drupal_get_path('module', 'flickr_tags') . '/flickr_tags.css');
+  }
   drupal_set_title(t('Flickr tags cloud - @name', array('@name' => $account->name)));
   $nsid = $account->flickr['nsid'];
   // Get tag info.
@@ -85,7 +87,9 @@ function flickr_tags_cloud($account, $nsid = NULL) {
  * Returns a given user's tags.
  */
 function flickr_tags_list($account, $nsid = NULL) {
-  drupal_add_css(drupal_get_path('module', 'flickr_tags') . '/flickr_tags.css');
+  if (variable_get('flickr_css', 1)) {
+    drupal_add_css(drupal_get_path('module', 'flickr_tags') . '/flickr_tags.css');
+  }
   drupal_set_title(t('Flickr tags list - @name', array('@name' => $account->name)));
   $nsid = $account->flickr['nsid'];
   // Get all tags.
@@ -119,7 +123,6 @@ function flickr_tags_list($account, $nsid = NULL) {
 function flickr_tags_photos($account, $tagstring) {
   global $pager_page_array, $pager_total, $pager_total_items;
 
-  drupal_add_css(drupal_get_path('module', 'flickr') . '/flickr.css');
   drupal_set_title(t('Flickr photos of @user tagged @tag', array(
     '@user' => $account->name,
     '@tag' => $tagstring,