Starting to specify new declarative cleaning in #17.