Cleanup places that use explicit wiring of the components