remove unused local 'builder' var
remove unused field BOOTSTRAP_TIMEOUT