Remove unnecessary uses of unfold and move unused modal logic lemmas to a separate file