Templates are not removed during cleanup (OPS-07)