bootstrap cleanup 1