Adding cleanup tasks