Addresses #309, cli version at least, so that one can remove generated files