Removed a few redundant registers and wires.