Add extra cleaning