Clean up wireup as well

Again, should have been done in the merge.