Strict clean

#11