Improve cleanup tasks (remove most filters, optimize deletion patterns)

refs #728