more startup / bootstrap cleanup