add proper cleaning
refs #1260