code strengthen
simplify adapters (inproc & remote)