Forgot to remove templates