We have 3 register file implementations, one flip-flop based, one latch based and one targetting FPGA implementation. They all duplicate various bits of security hardening logic. The register files should be refactored so the security hardening logic is in a common module as much as is possible and keeping the per-implementation logic to a minimum.