Transport cleanup

* Remove several unused methods
* Remove some unused parameters
* Reorder imports