remove run_time as it is no longer used or supplied
remove a bunch of no longer used settings
more aggressive shutdown code