Added --clean and --path options