Removed extra template