removed client mapper