Switched all menu items to the new mechanism
Cleaning up a deleted file

As usual, GfW doesn't quite get moves.