diff --git a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_0.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_0.java
index 80df0c0a0..25de4a6e0 100644
--- a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_0.java
+++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_0.java
@@ -578,9 +578,6 @@ public class TestMITREidDataService_1_0 {
 		Date creationDate1 = formatter.parse("2014-09-10T22:49:44.090+0000", Locale.ENGLISH);
 		Date accessDate1 = formatter.parse("2014-09-10T23:49:44.090+0000", Locale.ENGLISH);
 
-		WhitelistedSite mockWlSite1 = mock(WhitelistedSite.class);
-		when(mockWlSite1.getId()).thenReturn(1L);
-
 		OAuth2AccessTokenEntity mockToken1 = mock(OAuth2AccessTokenEntity.class);
 		when(mockToken1.getId()).thenReturn(1L);
 
@@ -590,7 +587,6 @@ public class TestMITREidDataService_1_0 {
 		site1.setCreationDate(creationDate1);
 		site1.setAccessDate(accessDate1);
 		site1.setUserId("user1");
-		site1.setWhitelistedSite(mockWlSite1);
 		site1.setAllowedScopes(ImmutableSet.of("openid", "phone"));
 		site1.setApprovedAccessTokens(ImmutableSet.of(mockToken1));
 
@@ -671,8 +667,8 @@ public class TestMITREidDataService_1_0 {
 		});
 
 		dataService.importData(reader);
-		//2 for sites, 1 for updating access token ref on #1, 1 more for updating whitelistedSite ref on #2
-		verify(approvedSiteRepository, times(4)).save(capturedApprovedSites.capture());
+		//2 for sites, 1 for updating access token ref on #1
+		verify(approvedSiteRepository, times(3)).save(capturedApprovedSites.capture());
 
 				List<ApprovedSite> savedSites = new ArrayList(fakeDb.values());
 
@@ -682,7 +678,6 @@ public class TestMITREidDataService_1_0 {
 				assertThat(savedSites.get(0).getAccessDate(), equalTo(site1.getAccessDate()));
 				assertThat(savedSites.get(0).getCreationDate(), equalTo(site1.getCreationDate()));
 				assertThat(savedSites.get(0).getAllowedScopes(), equalTo(site1.getAllowedScopes()));
-				assertThat(savedSites.get(0).getIsWhitelisted(), equalTo(site1.getIsWhitelisted()));
 				assertThat(savedSites.get(0).getTimeoutDate(), equalTo(site1.getTimeoutDate()));
 				assertThat(savedSites.get(0).getApprovedAccessTokens().size(), equalTo(site1.getApprovedAccessTokens().size()));
 
@@ -691,7 +686,6 @@ public class TestMITREidDataService_1_0 {
 				assertThat(savedSites.get(1).getCreationDate(), equalTo(site2.getCreationDate()));
 				assertThat(savedSites.get(1).getAllowedScopes(), equalTo(site2.getAllowedScopes()));
 				assertThat(savedSites.get(1).getTimeoutDate(), equalTo(site2.getTimeoutDate()));
-				assertThat(savedSites.get(1).getIsWhitelisted(), equalTo(site2.getIsWhitelisted()));
 				assertThat(savedSites.get(1).getApprovedAccessTokens().size(), equalTo(site2.getApprovedAccessTokens().size()));
 	}
 
diff --git a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_1.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_1.java
index 6d8188e9f..71a9dfd76 100644
--- a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_1.java
+++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_1.java
@@ -582,9 +582,6 @@ public class TestMITREidDataService_1_1 {
 		Date creationDate1 = formatter.parse("2014-09-10T22:49:44.090+0000", Locale.ENGLISH);
 		Date accessDate1 = formatter.parse("2014-09-10T23:49:44.090+0000", Locale.ENGLISH);
 
-		WhitelistedSite mockWlSite1 = mock(WhitelistedSite.class);
-		when(mockWlSite1.getId()).thenReturn(1L);
-
 		OAuth2AccessTokenEntity mockToken1 = mock(OAuth2AccessTokenEntity.class);
 		when(mockToken1.getId()).thenReturn(1L);
 
@@ -594,7 +591,6 @@ public class TestMITREidDataService_1_1 {
 		site1.setCreationDate(creationDate1);
 		site1.setAccessDate(accessDate1);
 		site1.setUserId("user1");
-		site1.setWhitelistedSite(mockWlSite1);
 		site1.setAllowedScopes(ImmutableSet.of("openid", "phone"));
 		site1.setApprovedAccessTokens(ImmutableSet.of(mockToken1));
 
@@ -675,8 +671,8 @@ public class TestMITREidDataService_1_1 {
 		});
 
 		dataService.importData(reader);
-		//2 for sites, 1 for updating access token ref on #1, 1 more for updating whitelistedSite ref on #2
-		verify(approvedSiteRepository, times(4)).save(capturedApprovedSites.capture());
+		//2 for sites, 1 for updating access token ref on #1
+		verify(approvedSiteRepository, times(3)).save(capturedApprovedSites.capture());
 
 				List<ApprovedSite> savedSites = new ArrayList(fakeDb.values());
 
@@ -686,7 +682,6 @@ public class TestMITREidDataService_1_1 {
 				assertThat(savedSites.get(0).getAccessDate(), equalTo(site1.getAccessDate()));
 				assertThat(savedSites.get(0).getCreationDate(), equalTo(site1.getCreationDate()));
 				assertThat(savedSites.get(0).getAllowedScopes(), equalTo(site1.getAllowedScopes()));
-				assertThat(savedSites.get(0).getIsWhitelisted(), equalTo(site1.getIsWhitelisted()));
 				assertThat(savedSites.get(0).getTimeoutDate(), equalTo(site1.getTimeoutDate()));
 				assertThat(savedSites.get(0).getApprovedAccessTokens().size(), equalTo(site1.getApprovedAccessTokens().size()));
 
@@ -695,7 +690,6 @@ public class TestMITREidDataService_1_1 {
 				assertThat(savedSites.get(1).getCreationDate(), equalTo(site2.getCreationDate()));
 				assertThat(savedSites.get(1).getAllowedScopes(), equalTo(site2.getAllowedScopes()));
 				assertThat(savedSites.get(1).getTimeoutDate(), equalTo(site2.getTimeoutDate()));
-				assertThat(savedSites.get(1).getIsWhitelisted(), equalTo(site2.getIsWhitelisted()));
 				assertThat(savedSites.get(1).getApprovedAccessTokens().size(), equalTo(site2.getApprovedAccessTokens().size()));
 	}
 
diff --git a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_2.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_2.java
index b0f5dd651..0454f2b1c 100644
--- a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_2.java
+++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_2.java
@@ -1140,9 +1140,6 @@ public class TestMITREidDataService_1_2 {
 		Date creationDate1 = formatter.parse("2014-09-10T22:49:44.090+0000", Locale.ENGLISH);
 		Date accessDate1 = formatter.parse("2014-09-10T23:49:44.090+0000", Locale.ENGLISH);
 
-		WhitelistedSite mockWlSite1 = mock(WhitelistedSite.class);
-		when(mockWlSite1.getId()).thenReturn(1L);
-
 		OAuth2AccessTokenEntity mockToken1 = mock(OAuth2AccessTokenEntity.class);
 		when(mockToken1.getId()).thenReturn(1L);
 
@@ -1152,7 +1149,6 @@ public class TestMITREidDataService_1_2 {
 		site1.setCreationDate(creationDate1);
 		site1.setAccessDate(accessDate1);
 		site1.setUserId("user1");
-		site1.setWhitelistedSite(mockWlSite1);
 		site1.setAllowedScopes(ImmutableSet.of("openid", "phone"));
 		site1.setApprovedAccessTokens(ImmutableSet.of(mockToken1));
 
@@ -1247,11 +1243,6 @@ public class TestMITREidDataService_1_2 {
 				}
 				assertThat(site.get("userId").getAsString(), equalTo(compare.getUserId()));
 				assertThat(jsonArrayToStringSet(site.getAsJsonArray("allowedScopes")), equalTo(compare.getAllowedScopes()));
-				if (site.get("whitelistedSiteId").isJsonNull()) {
-					assertNull(compare.getWhitelistedSite());
-				} else {
-					assertThat(site.get("whitelistedSiteId").getAsLong(), equalTo(compare.getWhitelistedSite().getId()));
-				}
 				if (site.get("approvedAccessTokens").isJsonNull() || site.getAsJsonArray("approvedAccessTokens") == null) {
 					assertTrue(compare.getApprovedAccessTokens() == null || compare.getApprovedAccessTokens().isEmpty());
 				} else {
@@ -1274,9 +1265,6 @@ public class TestMITREidDataService_1_2 {
 		Date creationDate1 = formatter.parse("2014-09-10T22:49:44.090+0000", Locale.ENGLISH);
 		Date accessDate1 = formatter.parse("2014-09-10T23:49:44.090+0000", Locale.ENGLISH);
 
-		WhitelistedSite mockWlSite1 = mock(WhitelistedSite.class);
-		when(mockWlSite1.getId()).thenReturn(1L);
-
 		OAuth2AccessTokenEntity mockToken1 = mock(OAuth2AccessTokenEntity.class);
 		when(mockToken1.getId()).thenReturn(1L);
 
@@ -1286,7 +1274,6 @@ public class TestMITREidDataService_1_2 {
 		site1.setCreationDate(creationDate1);
 		site1.setAccessDate(accessDate1);
 		site1.setUserId("user1");
-		site1.setWhitelistedSite(mockWlSite1);
 		site1.setAllowedScopes(ImmutableSet.of("openid", "phone"));
 		site1.setApprovedAccessTokens(ImmutableSet.of(mockToken1));
 
@@ -1367,8 +1354,8 @@ public class TestMITREidDataService_1_2 {
 		});
 
 		dataService.importData(reader);
-		//2 for sites, 1 for updating access token ref on #1, 1 more for updating whitelistedSite ref on #2
-		verify(approvedSiteRepository, times(4)).save(capturedApprovedSites.capture());
+		//2 for sites, 1 for updating access token ref on #1
+		verify(approvedSiteRepository, times(3)).save(capturedApprovedSites.capture());
 
 				List<ApprovedSite> savedSites = new ArrayList(fakeDb.values());
 
@@ -1378,7 +1365,6 @@ public class TestMITREidDataService_1_2 {
 				assertThat(savedSites.get(0).getAccessDate(), equalTo(site1.getAccessDate()));
 				assertThat(savedSites.get(0).getCreationDate(), equalTo(site1.getCreationDate()));
 				assertThat(savedSites.get(0).getAllowedScopes(), equalTo(site1.getAllowedScopes()));
-				assertThat(savedSites.get(0).getIsWhitelisted(), equalTo(site1.getIsWhitelisted()));
 				assertThat(savedSites.get(0).getTimeoutDate(), equalTo(site1.getTimeoutDate()));
 				assertThat(savedSites.get(0).getApprovedAccessTokens().size(), equalTo(site1.getApprovedAccessTokens().size()));
 
@@ -1387,7 +1373,6 @@ public class TestMITREidDataService_1_2 {
 				assertThat(savedSites.get(1).getCreationDate(), equalTo(site2.getCreationDate()));
 				assertThat(savedSites.get(1).getAllowedScopes(), equalTo(site2.getAllowedScopes()));
 				assertThat(savedSites.get(1).getTimeoutDate(), equalTo(site2.getTimeoutDate()));
-				assertThat(savedSites.get(1).getIsWhitelisted(), equalTo(site2.getIsWhitelisted()));
 				assertThat(savedSites.get(1).getApprovedAccessTokens().size(), equalTo(site2.getApprovedAccessTokens().size()));
 	}