Simplified clean-up in launcher.py's onCancel and onExit, because
most (all?) of the clean-up is now done in LoginTasks.py