Clean up of client side, added server side.