more bootstrap cleanup