Added a --dontclean option to speed up development