Finish cleaning up Silicon and Transport, for #2045