Commenting, cleanup, close our Transport.

This works, I'm shipping it and hopefully I'll get some answers.