The legacy logic was useful for comparing the current lock's behavior to the old lock, but now being tested the new locking behavior seems stable. Removing the legacy logic would help clean up the codepaths (since they aren't used except for testing) and avoid bugs.