"echo target" cleanups