clean up comments; quiet noisy messages from trace/untrace in package environments