diff --git a/util/SqlUpdate/2017-05-08_00_OrgUseGroups.sql b/util/SqlUpdate/2017-05-08_00_OrgUseGroups.sql
deleted file mode 100644
index f06d02467b..0000000000
--- a/util/SqlUpdate/2017-05-08_00_OrgUseGroups.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table [organization] add [UseGroups] bit null
-go
-update [organization] set UseGroups = 0
-go
-alter table [organization] alter column [UseGroups] bit not null
-go
\ No newline at end of file
diff --git a/util/SqlUpdate/2017-05-11_00_AlterCollectionUser.sql b/util/SqlUpdate/2017-05-11_00_AlterCollectionUser.sql
deleted file mode 100644
index a3326ba1f9..0000000000
--- a/util/SqlUpdate/2017-05-11_00_AlterCollectionUser.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-alter table [CollectionUser] drop constraint [PK_CollectionUser]
-go
-
-alter table [CollectionUser] drop column id
-go
-
-alter table [CollectionUser] drop column revisiondate
-go
-
-alter table [CollectionUser] drop column creationdate
-go
diff --git a/util/SqlUpdate/2017-06-07_00_UserTwoFactorCleanup.sql b/util/SqlUpdate/2017-06-07_00_UserTwoFactorCleanup.sql
new file mode 100644
index 0000000000..326041f8e7
--- /dev/null
+++ b/util/SqlUpdate/2017-06-07_00_UserTwoFactorCleanup.sql
@@ -0,0 +1,20 @@
+update [user]
+set twofactorproviders = '{"0":{"Enabled":'+ (case when twofactorenabled = 1 then 'true' else 'false' end) +',"Remember":true,"MetaData":{"Key":"'+ authenticatorkey +'"}}}'
+where twofactorprovider is not null and twofactorprovider = 0
+and authenticatorkey is not null
+go
+
+alter table [user] drop column authenticatorkey
+go
+
+drop view [userview]
+go
+
+CREATE VIEW [dbo].[UserView]
+AS
+SELECT
+    *
+FROM
+    [dbo].[User]
+go
+