Style fixes
Introduce a way to store cleanup actions in transport.