removed unused classes, added client side classes