more residual templates removed