fix/clean bootstrap