Finished up the --clean logic