removed unused client codes