additional bootstrap cleanup