Removed slightly dubious concept of a clean function