WIP Cleanup bootstrapper