[WIP] Removing receipt from disconnect builder.
[WIP] Encapsulating access to headers, and removing debug code.