some cleanup, and safety commit before changing flow