Removed old code, got mock transport tests almost working.