[WIP] More cleanups

Bootstrap's almost back