Revert "Make "clean" invoke "novo", and make "clobber" do what "clean" used to do."

This reverts commit 1530a103bd99ba38d28c365e6d5db0b5715f909a