Various automation fixes...
Remove some menu options that I don't plan on implementing for automation
anytime soon...