client/server app separation, partial clean