Remove old cleaning code, active command line option --no-clean