Cleaning up the wiring