Removed wires and functionality which should no longer be necessary.