Add last bit of cleaning