Clean out some old logic
Replaceable menu options