diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx
index 1e520d73..4899b260 100644
--- a/client/src/components/vbox.component.jsx
+++ b/client/src/components/vbox.component.jsx
@@ -10,7 +10,6 @@ const addState = connect(
     function receiveState(state) {
         const {
             ws,
-            account,
             instance,
             player,
             combiner,
diff --git a/client/src/events.jsx b/client/src/events.jsx
index 9d666be3..38388cac 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -120,10 +120,11 @@ function registerEvents(store) {
         if (v) {
             ws.startInstanceStateTimeout(v.id);
 
+            const player = v.players.find(p => p.id === account.id);
+            store.dispatch(actions.setPlayer(player));
+
             if (!instance || v.id !== instance.id) {
                 store.dispatch(actions.setNav('vbox'));
-                const player = v.players.find(p => p.id === account.id);
-                store.dispatch(actions.setPlayer(player));
                 const first = player.constructs[0];
                 store.dispatch(actions.setActiveConstruct(first));
             }
diff --git a/server/src/rpc.rs b/server/src/rpc.rs
index 464ff017..f6a2c8b7 100644
--- a/server/src/rpc.rs
+++ b/server/src/rpc.rs
@@ -4,11 +4,7 @@ use tungstenite::Message::Binary;
 use postgres::transaction::Transaction;
 use std::net::{TcpStream};
 
-// demo
-use std::iter;
 use std::time::Instant;
-use rand::{thread_rng, Rng};
-use rand::distributions::{Alphanumeric};
 
 use serde_cbor::{from_slice, to_vec};
 use uuid::Uuid;
@@ -353,11 +349,6 @@ impl Rpc {
             params: RpcResult::InstanceState(vbox_apply(msg.params, tx, &account)?)
         };
 
-        Rpc::send_msg(client, RpcResponse {
-            method: "account_constructs".to_string(),
-            params: RpcResult::ConstructList(account_constructs(tx, &account)?)
-        })?;
-
         return Ok(response);
     }
 
@@ -380,11 +371,6 @@ impl Rpc {
             params: RpcResult::InstanceState(vbox_unequip(msg.params, tx, &account)?)
         };
 
-        Rpc::send_msg(client, RpcResponse {
-            method: "account_constructs".to_string(),
-            params: RpcResult::ConstructList(account_constructs(tx, &account)?)
-        })?;
-
         return Ok(response);
     }
 }