Remove used files
Add more bootstrapping changes + improve user add dialog