cleanup and devtools reinstall bug fix