HOPKINS: Clean up the menu code