[MERGE][#307327] Remove broken debugging cruft, and some unused imports.

[Jonathan Lange]

Jonathan Lange has voted comment.
Status is now: Semi-approved
Comment:
Looks good to me. Are the unused imports actually used to re-export 
those names, or are they really unused?

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C20081212012136.GA28171%40steerpike.home.puzzling.org%3E
Project: Bazaar