Fix cleans at the end of bootstrap. Closes #8