diff --git a/webapp/codereview/people.py b/webapp/codereview/people.py
index 0621796a73..901b5866b7 100644
--- a/webapp/codereview/people.py
+++ b/webapp/codereview/people.py
@@ -100,15 +100,6 @@ def admin_users(request):
   accounts = models.Account.get_all_accounts()
   return respond(request, 'admin_users.html', {'users': accounts})
 
-@admin_required
-def admin_users_verify_cla(request):
-  """/admin/users - list of all users"""
-  accounts = models.Account.gql('WHERE welcomed=True '
-                              + 'AND individual_cla_version != 0'
-                              + 'AND cla_verified=False').fetch(1000)
-  return respond(request, 'admin_users.html', {'users': accounts})
-
-
 def _get_groups_for_account(account):
   return models.gql(models.AccountGroup,
                     'WHERE members = :1',
diff --git a/webapp/codereview/settings.py b/webapp/codereview/settings.py
index c2c34cd8e7..371c37df16 100644
--- a/webapp/codereview/settings.py
+++ b/webapp/codereview/settings.py
@@ -172,6 +172,7 @@ class WelcomeForm3Individual(BaseForm):
     account = state['account']
     # NOTE: just using 1 for now, future versions can come later
     account.individual_cla_version = 1
+    account.cla_verified = True
     account.mailing_address = cd['mailing_address']
     account.mailing_address_country = cd['mailing_address_country']
     account.phone_number = cd['phone_number']
diff --git a/webapp/codereview/urls.py b/webapp/codereview/urls.py
index 509d61b7ab..79424f8efe 100644
--- a/webapp/codereview/urls.py
+++ b/webapp/codereview/urls.py
@@ -62,7 +62,6 @@ urlpatterns = patterns(
     (r'^admin/settings/from_email$', 'views.admin_settings_from_email'),
     (r'^admin/settings/from_email_test$', 'views.admin_settings_from_email_test'),
     (r'^admin/users$', 'people.admin_users'),
-    (r'^admin/users/verify_cla$', 'people.admin_users_verify_cla'),
     (r'^admin/people_info$', 'people.admin_people_info'),
     (r'^admin/user/(.+)$', 'people.admin_user'),
     (r'^admin/groups$', 'people.admin_groups'),
diff --git a/webapp/index.yaml b/webapp/index.yaml
index e3da05a40f..88ba76bc51 100644
--- a/webapp/index.yaml
+++ b/webapp/index.yaml
@@ -10,7 +10,7 @@ indexes:
 # automatically uploaded to the admin console when you next deploy
 # your application using appcfg.py.
 
-# Used 2 times in query history.
+# Used 4 times in query history.
 - kind: Account
   properties:
   - name: cla_verified
@@ -24,19 +24,19 @@ indexes:
   - name: cla_verified
   - name: individual_cla_version
 
-# Used 826 times in query history.
+# Used 504 times in query history.
 - kind: Branch
   properties:
   - name: status
   - name: merge_submitted
 
-# Used 22 times in query history.
+# Used 18 times in query history.
 - kind: BuildAttempt
   properties:
   - name: success
   - name: started
 
-# Used 42 times in query history.
+# Used 2 times in query history.
 - kind: Change
   properties:
   - name: claimed
@@ -46,49 +46,6 @@ indexes:
     direction: desc
 
 # Used 9 times in query history.
-- kind: Change
-  properties:
-  - name: closed
-  - name: modified
-    direction: desc
-
-# Used 108 times in query history.
-- kind: Change
-  properties:
-  - name: closed
-  - name: owner
-  - name: modified
-    direction: desc
-
-# Used 54 times in query history.
-- kind: Change
-  properties:
-  - name: closed
-  - name: reviewers
-  - name: modified
-    direction: desc
-
-# Unused in query history -- copied from input.
-- kind: Change
-  properties:
-  - name: modified
-    direction: desc
-
-# Unused in query history -- copied from input.
-- kind: Change
-  properties:
-  - name: owner
-  - name: modified
-    direction: desc
-
-# Unused in query history -- copied from input.
-- kind: Change
-  properties:
-  - name: reviewers
-  - name: modified
-    direction: desc
-
-# Unused in query history -- copied from input.
 - kind: Change
   properties:
   - name: claimed
@@ -98,7 +55,50 @@ indexes:
   - name: modified
     direction: desc
 
-# Used 8 times in query history.
+# Used 3 times in query history.
+- kind: Change
+  properties:
+  - name: closed
+  - name: modified
+    direction: desc
+
+# Used 38 times in query history.
+- kind: Change
+  properties:
+  - name: closed
+  - name: owner
+  - name: modified
+    direction: desc
+
+# Used 19 times in query history.
+- kind: Change
+  properties:
+  - name: closed
+  - name: reviewers
+  - name: modified
+    direction: desc
+
+# Unused in query history -- copied from input.
+- kind: Change
+  properties:
+  - name: modified
+    direction: desc
+
+# Unused in query history -- copied from input.
+- kind: Change
+  properties:
+  - name: owner
+  - name: modified
+    direction: desc
+
+# Unused in query history -- copied from input.
+- kind: Change
+  properties:
+  - name: reviewers
+  - name: modified
+    direction: desc
+
+# Unused in query history -- copied from input.
 - kind: Comment
   properties:
   - name: left
@@ -113,7 +113,7 @@ indexes:
   - name: patch
   - name: date
 
-# Used 13 times in query history.
+# Unused in query history -- copied from input.
 - kind: Comment
   properties:
   - name: patch
@@ -130,7 +130,7 @@ indexes:
   - name: author
   - name: draft
 
-# Used 99 times in query history.
+# Used once in query history.
 - kind: Message
   properties:
   - name: change
@@ -140,7 +140,7 @@ indexes:
 - kind: Message
   ancestor: yes
 
-# Used 132 times in query history.
+# Used once in query history.
 - kind: Patch
   properties:
   - name: patchset
@@ -150,7 +150,7 @@ indexes:
 - kind: Patch
   ancestor: yes
 
-# Used 361 times in query history.
+# Used once in query history.
 - kind: PatchSet
   properties:
   - name: change
@@ -171,16 +171,16 @@ indexes:
   - name: created
     direction: desc
 
-# Used 900 times in query history.
+# Used 557 times in query history.
 - kind: ReceivedBundle
   properties:
   - name: state
   - name: created
 
-# Used 14 times in query history.
+# Used once in query history.
 - kind: ReceivedBundleSegment
   ancestor: yes
 
-# Used 113 times in query history.
+# Used once in query history.
 - kind: ReviewStatus
   ancestor: yes
diff --git a/webapp/templates/admin_users.html b/webapp/templates/admin_users.html
index eb2265aa30..2928d543ec 100644
--- a/webapp/templates/admin_users.html
+++ b/webapp/templates/admin_users.html
@@ -2,10 +2,6 @@
 {%block title1%}Users{%endblock%}
 {%block body%}
 
-<a href="/admin/users">All Users</a>
-|
-<a href="/admin/users/verify_cla">Users w/ unverified CLA</a>
-
 <script>
 function user_button_submit() {
   var email = document.getElementById('straight_to_user').value;