Remove a lot of unnecessary communication between client and server