Some clean-up on the client side