added client side classes, removed unused classes