clean up some wiring