Clean up menu, organize helpers
Remove references to unneeded menu items