Removed client side stuff