Removed client classes