further refactor transport cleanup