Demo files cleanup, tweaks, removed BasicServiceClient