lots of bootstratp cleanup