Some cleanup and bootstrapping