Removed deprecated wires.
Fixed incorrect port name referenced in mux control.