Properly fix the issues pointed out by @djpbarry

[JonathanCSmith]

Removed runners from menus as that was adding confusion - these should only be called from headless + commandline