Currently there are "trace" print statements scattered throughout the
code.  These make the code harder to follow and aren't terribly useful.
Remove them in favor of on-demand instrumentation or more sophisticated
debugging methods (like a debugger).

Change-Id: I70a91b8dca34566d48ed1f4902cba5b9f9b4de40