removed older code on client side