Did some minor wire cleanup