Cleaner bootstrapping setup