Fixed some issues, removed unused imports, and preparing to move to a new transport system.