diff --git a/src/client_server.rs b/src/client_server.rs
index 244f91c..9dfe2d7 100644
--- a/src/client_server.rs
+++ b/src/client_server.rs
@@ -55,8 +55,7 @@ use ruma_events::{
 };
 use ruma_identifiers::{DeviceId, RoomAliasId, RoomId, RoomVersionId, UserId};
 use serde_json::{json, value::RawValue};
-
-use crate::{server_server, utils, Database, MatrixResult, Ruma};
+use crate::{utils, Database, MatrixResult, Ruma};
 
 const GUEST_NAME_LENGTH: usize = 10;
 const DEVICE_ID_LENGTH: usize = 10;
diff --git a/src/main.rs b/src/main.rs
index c4a630b..27493d1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,12 +6,9 @@ mod database;
 mod error;
 mod pdu;
 mod ruma_wrapper;
-mod server_server;
+//mod server_server;
 mod utils;
 
-#[cfg(test)]
-mod test;
-
 pub use database::Database;
 pub use error::{Error, Result};
 pub use pdu::PduEvent;
@@ -87,10 +84,10 @@ fn setup_rocket() -> rocket::Rocket {
                 client_server::delete_device_route,
                 client_server::delete_devices_route,
                 client_server::options_route,
-                server_server::well_known_server,
-                server_server::get_server_version,
-                server_server::get_server_keys,
-                server_server::get_server_keys_deprecated,
+                //server_server::well_known_server,
+                //server_server::get_server_version,
+                //server_server::get_server_keys,
+                //server_server::get_server_keys_deprecated,
             ],
         )
         .attach(AdHoc::on_attach("Config", |rocket| {
diff --git a/sytest/sytest-whitelist b/sytest/sytest-whitelist
index 1b09fa7..140fad8 100644
--- a/sytest/sytest-whitelist
+++ b/sytest/sytest-whitelist
@@ -28,26 +28,13 @@ POST /login wrong password is rejected
 POST /createRoom makes a private room
 POST /createRoom makes a private room with invites
 GET /rooms/:room_id/state/m.room.member/:user_id fetches my membership
-GET /rooms/:room_id/state/m.room.power_levels fetches powerlevels
-POST /join/:room_alias can join a room
 POST /join/:room_id can join a room
-POST /join/:room_id can join a room with custom content
-POST /join/:room_alias can join a room with custom content
 POST /rooms/:room_id/join can join a room
 POST /rooms/:room_id/leave can leave a room
 POST /rooms/:room_id/invite can send an invite
-POST /rooms/:room_id/ban can ban a user
-POST /rooms/:room_id/send/:event_type sends a message
-PUT /rooms/:room_id/send/:event_type/:txn_id sends a message
-PUT /rooms/:room_id/send/:event_type/:txn_id deduplicates the same txn id
-GET /rooms/:room_id/state/m.room.power_levels can fetch levels
 PUT /rooms/:room_id/state/m.room.power_levels can set levels
 PUT power_levels should not explode if the old power levels were empty
 Both GET and PUT work
-POST /rooms/:room_id/read_markers can create read marker
-User signups are forbidden from starting with '_'
-Request to logout with invalid an access token is rejected
-Request to logout without an access token is rejected
 Room creation reports m.room.create to myself
 Room creation reports m.room.member to myself
 Version responds 200 OK with valid structure
@@ -60,7 +47,6 @@ Can create filter
 Should reject keys claiming to belong to a different user
 Can add account data
 Checking local federation server
-Alternative server names do not cause a routing loop
 Can read configuration endpoint
 AS cannot create users outside its own namespace
 Changing the actions of an unknown default rule fails with 404
@@ -78,4 +64,16 @@ Trying to get push rules with unknown rule_id fails with 404
 GET /events with non-numeric 'limit'
 GET /events with negative 'limit'
 GET /events with non-numeric 'timeout'
-Getting push rules doesn't corrupt the cache SYN-390
\ No newline at end of file
+Getting push rules doesn't corrupt the cache SYN-390
+GET /publicRooms lists newly-created room
+PUT /directory/room/:room_alias creates alias
+3pid invite join with wrong but valid signature are rejected
+3pid invite join valid signature but revoked keys are rejected
+3pid invite join valid signature but unreachable ID server are rejected
+query for user with no keys returns empty key dict
+Can upload without a file name
+Can upload with ASCII file name
+User appears in user directory
+User directory correctly update on display name change
+User in shared private room does appear in user directory
+User in dir while user still shares private rooms