diff --git a/lib/Drupal/views/Plugin/views/query/Sql.php b/lib/Drupal/views/Plugin/views/query/Sql.php
index 2a43726b3e3c314127cfcabfcf97f666ba1081e9..a289d3911dabc59bea7ccffa8700ae384d68b6e6 100644
--- a/lib/Drupal/views/Plugin/views/query/Sql.php
+++ b/lib/Drupal/views/Plugin/views/query/Sql.php
@@ -148,9 +148,6 @@ public function init($base_table = 'node', $base_field = 'nid', $options) {
     );
   }
 
-  // ----------------------------------------------------------------
-  // Utility methods to set flags and data.
-
   /**
    * Set the view to be distinct (per base field).
    *
@@ -262,9 +259,6 @@ public function submitOptionsForm(&$form, &$form_state) {
     form_set_value($element, $value, $form_state);
   }
 
-  // ----------------------------------------------------------------
-  // Table/join adding
-
   /**
    * A relationship is an alternative endpoint to a series of table
    * joins. Relationships must be aliases of the primary table and
diff --git a/modules/aggregator.views.inc b/modules/aggregator.views.inc
index 2e128937a26c8cd7f5ad21c3938fb24c94672098..a61025360b8bcd7daae331cc32d5851c832bb2d1 100644
--- a/modules/aggregator.views.inc
+++ b/modules/aggregator.views.inc
@@ -11,7 +11,6 @@
  * Implements hook_views_data().
  */
 function aggregator_views_data() {
-  // ----------------------------------------------------------------------
   // Main Aggregator Item base table
 
   // Define the base group of this table. Fields that don't
@@ -25,7 +24,6 @@ function aggregator_views_data() {
     'help' => t("Aggregator items are imported from external RSS and Atom news feeds."),
   );
 
-  // ----------------------------------------------------------------
   // Fields
 
   // iid
@@ -167,7 +165,6 @@ function aggregator_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------------
   // Aggregator feed table
 
   $data['aggregator_feed']['table']['group']  = t('Aggregator feed');
@@ -299,7 +296,6 @@ function aggregator_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------------
   // Aggregator category feed table
 
   $data['aggregator_category_feed']['table']['join'] = array(
@@ -309,7 +305,6 @@ function aggregator_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------------
   // Aggregator category table
 
   $data['aggregator_category']['table']['group'] = t('Aggregator category');
diff --git a/modules/book.views.inc b/modules/book.views.inc
index 731a4959517aec7d9b48b425282c1b05668c2b23..6e2b890a8e595f06ca0aa3504575d80faa5e4c40 100644
--- a/modules/book.views.inc
+++ b/modules/book.views.inc
@@ -11,7 +11,6 @@
  * Implements hook_views_data().
  */
 function book_views_data() {
-  // ----------------------------------------------------------------------
   // book table
 
   $data['book']['table']['group']  = t('Book');
@@ -34,7 +33,6 @@ function book_views_data() {
     // and use the node: nid argument.
   );
 
-  // ----------------------------------------------------------------------
   // menu_links table -- this is aliased so we can get just book relations
 
   // Book hierarchy and weight data are now in {menu_links}.
@@ -86,7 +84,6 @@ function book_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------------
   // book_parent table -- this is an alias of the book table which
   // represents the parent book.
 
diff --git a/modules/comment.views.inc b/modules/comment.views.inc
index 6e1293be030ee7915f64ebebc6b7669ca2775d34..5d8976abfb617cc9265dff011363b5fd8897f20d 100644
--- a/modules/comment.views.inc
+++ b/modules/comment.views.inc
@@ -385,7 +385,6 @@ function comment_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------------
   // node_comment_statistics table
 
   // define the group
diff --git a/modules/file.views.inc b/modules/file.views.inc
index 2871043379b7cc44237e57832cb40f9db89c9bbd..387b344ea33c736091e1bcf2443761d9d2928670 100644
--- a/modules/file.views.inc
+++ b/modules/file.views.inc
@@ -13,7 +13,6 @@
 function file_views_data() {
   $data = array();
 
-  // ----------------------------------------------------------------------
   // file_managed table
 
   $data['file_managed']['table']['group']  = t('File');
@@ -178,7 +177,6 @@ function file_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------------
   // file_usage table
 
   $data['file_usage']['table']['group']  = t('File Usage');
diff --git a/modules/filter.views.inc b/modules/filter.views.inc
index ca708c4423d521d38fa4e80b767e97b5279a935f..941ae3a78d3f2124e2ebee885835aa0ef9109e5d 100644
--- a/modules/filter.views.inc
+++ b/modules/filter.views.inc
@@ -11,7 +11,6 @@
  * Implements hook_views_data().
  */
 function filter_views_data() {
-  // ----------------------------------------------------------------------
   // filter_format table
 
   // Have not defined $data['filter_formats']['table']['group'] since
diff --git a/modules/locale.views.inc b/modules/locale.views.inc
index 934a07787a94065764d1ea53dae15b3c572936c1..42bd31644f8886cb1ed5e7a6768de251c840b980 100644
--- a/modules/locale.views.inc
+++ b/modules/locale.views.inc
@@ -116,7 +116,6 @@ function locale_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------------
   // Locales target table
 
   // Define the base group of this table. Fields that don't
diff --git a/modules/node.views.inc b/modules/node.views.inc
index 7efd63011101954b71a854966dac03d7bea25fee..bf30614cebb565d05b2cda3fee12f5009a66f4f4 100644
--- a/modules/node.views.inc
+++ b/modules/node.views.inc
@@ -13,7 +13,6 @@
  * Implements hook_views_data().
  */
 function node_views_data() {
-  // ----------------------------------------------------------------
   // node table -- basic table information.
 
   // Define the base group of this table. Fields that don't
@@ -417,7 +416,6 @@ function node_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------------
   // Content revision table
 
   // Define the base group of this table. Fields that don't
@@ -618,7 +616,6 @@ function node_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------------
   // Node access table
 
   // Define the base group of this table. Fields that don't
@@ -643,7 +640,6 @@ function node_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------------
   // History table
 
   // We're actually defining a specific instance of the table, so let's
diff --git a/modules/poll.views.inc b/modules/poll.views.inc
index 718ff289b2b5e9df4797dd2e36e282b35150050f..b69f5060a6df8651292896a2753f0d4c4da920d7 100644
--- a/modules/poll.views.inc
+++ b/modules/poll.views.inc
@@ -22,7 +22,6 @@ function poll_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------
   // Fields
 
   // poll active status
diff --git a/modules/search.views.inc b/modules/search.views.inc
index 13a2f6829c3b3109c35cdd1c3bcd21d7ba0390ab..3208ede8c49a5a22ae113247f51d73df28c2fc48 100644
--- a/modules/search.views.inc
+++ b/modules/search.views.inc
@@ -55,7 +55,6 @@ function search_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------
   // Fields
 
   // score
diff --git a/modules/statistics.views.inc b/modules/statistics.views.inc
index 39a41fb76c6c91f004f09f6807102b57d2593ab8..b4e3caf1f139b890c3bd06dab0e98c2d241e99fc 100644
--- a/modules/statistics.views.inc
+++ b/modules/statistics.views.inc
@@ -13,7 +13,6 @@
 function statistics_views_data() {
   // Basic table information.
 
-  // ----------------------------------------------------------------
   // node_counter table
 
   $data['node_counter']['table']['group']  = t('Content statistics');
@@ -77,7 +76,6 @@ function statistics_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------
   // accesslog table
 
   $data['accesslog']['table']['group']  = t('Access log');
diff --git a/modules/taxonomy.views.inc b/modules/taxonomy.views.inc
index c7e208d44839269bdf0ce4419cdb004ad6b24d45..e3f6e1822249e573c0e84c2c816752a69c136dbd 100644
--- a/modules/taxonomy.views.inc
+++ b/modules/taxonomy.views.inc
@@ -13,7 +13,6 @@
 function taxonomy_views_data() {
   $data = array();
 
-  // ----------------------------------------------------------------------
   // taxonomy_vocabulary table
 
   $data['taxonomy_vocabulary']['table']['group']  = t('Taxonomy vocabulary');
@@ -96,7 +95,6 @@ function taxonomy_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------------
  // taxonomy_term_data table
 
   $data['taxonomy_term_data']['table']['group']  = t('Taxonomy term');
@@ -264,7 +262,6 @@ function taxonomy_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------------
   // taxonomy_index table
 
   $data['taxonomy_index']['table']['group']  = t('Taxonomy term');
@@ -323,7 +320,6 @@ function taxonomy_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------------
   // term_hierarchy table
 
   $data['taxonomy_term_hierarchy']['table']['group']  = t('Taxonomy term');
diff --git a/modules/user.views.inc b/modules/user.views.inc
index 83fa4903543fdcfed35ecc68b4ef0b062b98f3eb..295278a2ecbcb9b6cfcd82c6631f5b80acd6f8fd 100644
--- a/modules/user.views.inc
+++ b/modules/user.views.inc
@@ -11,7 +11,6 @@
  * Implements hook_views_data().
  */
 function user_views_data() {
-  // ----------------------------------------------------------------
   // users table
 
   // Define the base group of this table. Fields that don't
@@ -344,7 +343,6 @@ function user_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------------
   // users_roles table
 
   $data['users_roles']['table']['group']  = t('User');
@@ -379,7 +377,6 @@ function user_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------------
   // role table
 
   $data['role']['table']['join'] = array(
@@ -419,7 +416,6 @@ function user_views_data() {
     ),
   );
 
-  // ----------------------------------------------------------------------
   // authmap table
 
   $data['authmap']['table']['group']  = t('User');
diff --git a/views.module b/views.module
index 1b3ec2e2a463fd4fdd42d998ce501e503921ed47..078dff6817533fdc70e80e6ddb6813fbe9eef01a 100644
--- a/views.module
+++ b/views.module
@@ -1116,8 +1116,6 @@ function views_check_roles($rids, $account = NULL) {
   $roles[] = $account->uid ? DRUPAL_AUTHENTICATED_RID : DRUPAL_ANONYMOUS_RID;
   return user_access('access all views', $account) || array_intersect(array_filter($rids), $roles);
 }
-// ------------------------------------------------------------------
-// Functions to help identify views that are running or ran
 
 /**
  * Set the current 'page view' that is being displayed so that it is easy
@@ -1170,9 +1168,6 @@ function &views_get_current_view() {
   return views_set_current_view();
 }
 
-// ------------------------------------------------------------------
-// Include file helpers
-
 /**
  * Include views .inc files as necessary.
  */
@@ -1268,9 +1263,6 @@ function views_include_handlers($reset = FALSE) {
   $finished = TRUE;
 }
 
-// -----------------------------------------------------------------------
-// Views handler functions
-
 /**
  * Fetch a handler from the data cache.
  *
@@ -1338,9 +1330,6 @@ function views_fetch_data($table = NULL, $move = TRUE, $reset = FALSE) {
   return _views_fetch_data($table, $move, $reset);
 }
 
-// -----------------------------------------------------------------------
-// Views plugin functions
-
 /**
  * Fetch a list of all base tables available
  *
@@ -1446,9 +1435,6 @@ function views_get_enabled_display_extenders() {
   return drupal_map_assoc($enabled);
 }
 
-// -----------------------------------------------------------------------
-// Views database functions
-
 /**
  * Create an empty view to work with.
  *
@@ -1693,9 +1679,6 @@ function views_get_view($name) {
   }
 }
 
-// ------------------------------------------------------------------
-// Views form (View with form elements)
-
 /**
  * Returns TRUE if the passed-in view contains handlers with views form
  * implementations, FALSE otherwise.
@@ -1882,9 +1865,6 @@ function views_form_views_form_submit($form, &$form_state) {
   }
 }
 
-// ------------------------------------------------------------------
-// Exposed widgets form
-
 /**
  * Form builder for the exposed widgets form.
  *
@@ -2043,9 +2023,6 @@ function views_exposed_form_cache($views_name, $display_name, $form_output = NUL
   return empty($views_exposed[$views_name][$display_name]) ? FALSE : $views_exposed[$views_name][$display_name];
 }
 
-// ------------------------------------------------------------------
-// Misc helpers
-
 /**
  * Build a list of theme function names for use most everywhere.
  */
diff --git a/views_ui/admin.inc b/views_ui/admin.inc
index c7fbdc73794a1baed1ea5d549b644123ffa67a23..f272009001ff706f9cf8b2398efb63c34462dc27 100644
--- a/views_ui/admin.inc
+++ b/views_ui/admin.inc
@@ -725,9 +725,14 @@ function views_ui_standard_display_dropdown(&$form, &$form_state, $section) {
 
 }
 
-// --------------------------------------------------------------------------
-// Various subforms for editing the pieces of a view.
 
+/**
+ * Returns information about subforms for editing the pieces of a view.
+ *
+ * @param string|null $key
+ *   The form for which to retrieve data. If NULL, the list of all forms is
+ *   returned.
+ */
 function views_ui_ajax_forms($key = NULL) {
   $forms = array(
     'display' => array(
@@ -2489,9 +2494,6 @@ function views_ui_autocomplete_tag($string = '') {
   return new JsonResponse($matches);
 }
 
-// ------------------------------------------------------------------
-// Get information from the Views data
-
 function _views_weight_sort($a, $b) {
   if ($a['weight'] != $b['weight']) {
     return $a['weight'] < $b['weight'] ? -1 : 1;